diff --git a/ChangeLog b/ChangeLog
index 8843a2346..99889aa7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-07-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/WebServerResources/SchedulerUI.js: initialize the
+	"listFilter" global var depending on the value of the filter
+	popup.
+
+	* UI/Scheduler/UIxCalFilterPanel.m (-selectedFilter): return
+	"view_today" as default filter.
+
 2009-07-17  Cyril Robert <crobert@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
diff --git a/UI/Scheduler/UIxCalFilterPanel.m b/UI/Scheduler/UIxCalFilterPanel.m
index 8bfdfbd75..20f511813 100644
--- a/UI/Scheduler/UIxCalFilterPanel.m
+++ b/UI/Scheduler/UIxCalFilterPanel.m
@@ -109,7 +109,13 @@ static NSArray *filters = nil;
 
 - (NSString *) selectedFilter
 {
-  return [self queryParameterForKey: @"filterpopup"];
+  NSString *selectedFilter;
+
+  selectedFilter = [self queryParameterForKey: @"filterpopup"];
+  if (![selectedFilter length])
+    selectedFilter = @"view_today";
+
+  return selectedFilter;
 }
 
 @end /* UIxCalFilterPanel */
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 3c39e25d1..44fc80c5d 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -2071,7 +2071,7 @@ function initCalendars() {
   
     if (!$(document.body).hasClassName("popup")) {
         var node = $("filterpopup");
-        node.value = listFilter;
+        listFilter = node.value;
         initDateSelectorEvents();
         initCalendarSelector();
         configureSearchField();