diff --git a/USERGUIDE.md b/USERGUIDE.md
index 521730bea..9f22a0f42 100644
--- a/USERGUIDE.md
+++ b/USERGUIDE.md
@@ -621,6 +621,7 @@ Whether to place all folders on top of the gamelists. If done so, the folders wi
 Whether to sort your favorite games above your other games in the gamelists.
 
 **Add star markings to favorite games**
+
 With this setting enabled, there is a star symbol added at the beginning of the game name in the gamelist views. It's strongly recommended to keep this setting enabled if the option to sort favorite games above non-favorites has been enabled. If not, favorite games would be sorted on top of the gamelist with no visual indication that they are favorites, which would be very confusing.
 
 **Gamelist filters**
diff --git a/es-app/src/guis/GuiGamelistOptions.cpp b/es-app/src/guis/GuiGamelistOptions.cpp
index 5adb5ecd8..e9ca5e4d6 100644
--- a/es-app/src/guis/GuiGamelistOptions.cpp
+++ b/es-app/src/guis/GuiGamelistOptions.cpp
@@ -144,20 +144,22 @@ GuiGamelistOptions::GuiGamelistOptions(
         }
     }
 
-    std::map<std::string, CollectionSystemData, stringComparator> customCollections =
-            CollectionSystemManager::get()->getCustomCollectionSystems();
+    std::string customSystem;
+    if (Settings::getInstance()->getBool("UseCustomCollectionsSystem"))
+        customSystem = file->getSystem()->getName();
+    else
+        customSystem = system->getName();
 
     if (UIModeController::getInstance()->isUIModeFull() &&
-        ((customCollections.find(system->getName()) != customCollections.cend() &&
-        CollectionSystemManager::get()->getEditingCollection() != system->getName()) ||
-        CollectionSystemManager::get()->getCustomCollectionsBundle()->getName() ==
-                system->getName())) {
-        row.elements.clear();
-        row.addElement(std::make_shared<TextComponent>(
-                mWindow, "ADD/REMOVE GAMES TO THIS GAME COLLECTION", Font::get(FONT_SIZE_MEDIUM),
-                0x777777FF), true);
-        row.makeAcceptInputHandler(std::bind(&GuiGamelistOptions::startEditMode, this));
-        mMenu.addRow(row);
+            (isCustomCollection || isCustomCollectionGroup)) {
+        if (CollectionSystemManager::get()->getEditingCollection() != customSystem) {
+            row.elements.clear();
+            row.addElement(std::make_shared<TextComponent>(
+                    mWindow, "ADD/REMOVE GAMES TO THIS GAME COLLECTION",
+                    Font::get(FONT_SIZE_MEDIUM), 0x777777FF), true);
+            row.makeAcceptInputHandler(std::bind(&GuiGamelistOptions::startEditMode, this));
+            mMenu.addRow(row);
+        }
     }
 
     if (UIModeController::getInstance()->isUIModeFull() &&