diff --git a/ChangeLog b/ChangeLog
index b98904855..339ca7253 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-25  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/SchedulerUI.js (onFolderUnsubscribeCB):
+	select the personal calendar to avoid trying creating an event or
+	a task in the calendar to which the user has just unsubscribed.
+
 2011-04-25  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* Added the concept of "resources" in SOGo in order
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 881d1dc27..f0d9cf492 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -2752,8 +2752,11 @@ function onFolderSubscribeCB(folderData) {
 
 function onFolderUnsubscribeCB(folderId) {
     var node = $(folderId);
-    node.parentNode.removeChild(node);
+    var list = $(node.parentNode);
+    node.deselect();
+    list.removeChild(node);
     if (removeFolderRequestCount == 0) {
+        list.down("li").selectElement(); // personal calendar
         refreshEvents();
         refreshTasks();
         changeCalendarDisplay();