diff --git a/ChangeLog b/ChangeLog
index 47f457ae2..de615496a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-14  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/UIxPreferences.js: Fixed a bug when saving
+	the preferences while some of the calendar categories are still editable.
+
 2010-06-11  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Scheduler/UIxCalMainActions.m (-saveUrl:forCalendar:):
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index b18adc0fb..0d65c6ae0 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -11,6 +11,7 @@ function savePreferences(sender) {
         sigList.disabled = false;
 
     if ($("categoriesList")) {
+        endAllEditables();
         serializeCategories();
     }
 
@@ -468,6 +469,8 @@ function onCategoryAdd (e) {
     var colortd = new Element ("td");
     var colordiv = new Element ("div", {"class": "colorBox"});
 
+    endAllEditables();
+
     row.identify ();
     row.addClassName ("categoryListRow");