diff --git a/incidenceeditor-ng/incidencecategories.cpp b/incidenceeditor-ng/incidencecategories.cpp
--- a/incidenceeditor-ng/incidencecategories.cpp
+++ b/incidenceeditor-ng/incidencecategories.cpp
@@ -112,9 +112,14 @@
 {
     QStringList tagsToCheck = sender()->property("categoriesToCheck").toStringList();
     foreach (const Akonadi::Tag &tag, tags) {
+        if (tagsToCheck.contains(tag.gid()) || tagsToCheck.contains(tag.name())) {
+            mSelectedTags << tag;
+        }
         tagsToCheck.removeAll(tag.gid());
         tagsToCheck.removeAll(tag.name());
     }
+    mUi->mTagWidget->setSelection(mSelectedTags);
+
     foreach ( const QString &category, tagsToCheck ) {
         kDebug() << "Creating tag: " << category;
         Akonadi::Tag tag = Akonadi::Tag::genericTag(category);
@@ -131,5 +136,4 @@
     kDebug() << "Created tag: " << createdTag;
     mSelectedTags << createdTag;
     mUi->mTagWidget->setSelection(mSelectedTags);
-    onSelectionChanged(mSelectedTags);
 }