diff --git a/ChangeLog b/ChangeLog
index 2f091236a..67bb304bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-02  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/SchedulerUI.js (onClickableCellsDblClick):
+	hack to ignore double-click in the scrollbar in the month view &
+	fix for Firefox.
+
 2010-03-31  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* Tools/sogo-slapd-sockd.m, Tools/SOGoSockDOperation.m,
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 47bb603c9..a71ad53d4 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -1100,7 +1100,8 @@ function scrollDayView(scrollEvent) {
 
 function onClickableCellsDblClick(event) {
     var target = getTarget(event);
-    if (target.hasClassName("dayHeader") || this.clientHeight >= this.scrollHeight) {
+    // Hack to ignore double-click in the scrollbar
+    if (target.hasClassName("dayHeader") || (this.scrollHeight - this.clientHeight <= 1)) {
         newEventFromWidget(this, 'event');
         Event.stop(event);
     }