2 files changed, 8 insertions, 0 deletions

diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index f5eb52e..496f125 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -123,2 +123,3 @@ void KOEditorGeneral::editCategories()
     //KOGlobals::fitDialogToScreen( csd );
+    csd->setColorEnabled();
     csd->setSelected( QStringList::split (",", mCategoriesLabel->text()) );
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 1a1bce5..3011458 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -963,2 +963,3 @@ void KOTodoView::changedCategories(int index)
     QStringList categories = mActiveItem->todo()->categories ();
+    QString colcat = categories.first();
     if (categories.find (mCategory[index]) != categories.end ())
@@ -968,2 +969,8 @@ void KOTodoView::changedCategories(int index)
     categories.sort ();
+    if ( !colcat.isEmpty() ) {
+        if ( categories.find ( colcat ) != categories.end () ) {
+            categories.remove( colcat );
+            categories.prepend( colcat );
+        }
+    }
     mActiveItem->todo()->setCategories (categories);