diff --git a/es-app/src/guis/GuiCollectionSystemsOptions.cpp b/es-app/src/guis/GuiCollectionSystemsOptions.cpp
index ce45522e4..6633c2ca8 100644
--- a/es-app/src/guis/GuiCollectionSystemsOptions.cpp
+++ b/es-app/src/guis/GuiCollectionSystemsOptions.cpp
@@ -316,6 +316,8 @@ GuiCollectionSystemsOptions::GuiCollectionSystemsOptions(
                 Settings::getInstance()->getBool("UseCustomCollectionsSystem")) {
             Settings::getInstance()->setBool("UseCustomCollectionsSystem",
                     use_custom_collections_system->getState());
+            if (CollectionSystemsManager::get()->isEditing())
+                CollectionSystemsManager::get()->exitEditMode();
             setNeedsSaving();
             setNeedsCollectionsUpdate();
             setNeedsReloading();