diff --git a/ChangeLog b/ChangeLog
index 91f2fda6f..19af8bf41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-04-24  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/SchedulerUI.js (updateCalendarStatus): if
+	"event" is set, we set its returnValue to true, to avoid a bug
+	occurring since the use of "clickEventWrapper".
+
 	* UI/WebServerResources/HTMLElement.js: get "HTMLCollection"
 	and "NodeList" classes by class rather than by direct reference.
 
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index d2e548a91..6b2cde478 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -2399,7 +2399,9 @@ function updateCalendarStatus(event) {
         changeCalendarDisplay();
     }
 
-    return false;
+    if (event) {
+        event.returnValue = true;
+    }
 }
 
 function calendarStatusCallback(http) {