diff --git a/es-app/src/guis/GuiCollectionSystemsOptions.cpp b/es-app/src/guis/GuiCollectionSystemsOptions.cpp
index a6546a92a..d320a1f40 100644
--- a/es-app/src/guis/GuiCollectionSystemsOptions.cpp
+++ b/es-app/src/guis/GuiCollectionSystemsOptions.cpp
@@ -221,6 +221,9 @@ void GuiCollectionSystemsOptions::applySettings()
 void GuiCollectionSystemsOptions::updateSettings(std::string newAutoSettings,
         std::string newCustomSettings)
 {
+    if (CollectionSystemManager::get()->isEditing())
+        CollectionSystemManager::get()->exitEditMode();
+
     Settings::getInstance()->setString("CollectionSystemsAuto", newAutoSettings);
     Settings::getInstance()->setString("CollectionSystemsCustom", newCustomSettings);
     Settings::getInstance()->setBool("FavFirstCustom", sortFavFirstCustomSwitch->getState());