diff --git a/es-app/src/main.cpp b/es-app/src/main.cpp
index d6bfe357a..9c09c3303 100644
--- a/es-app/src/main.cpp
+++ b/es-app/src/main.cpp
@@ -337,6 +337,7 @@ bool parseArgs(int argc, char* argv[])
         }
         else if (strcmp(argv[i], "--gamelist-only") == 0) {
             Settings::getInstance()->setBool("ParseGamelistOnly", true);
+            settingsNeedSaving = true;
         }
         else if (strcmp(argv[i], "--ignore-gamelist") == 0) {
             Settings::getInstance()->setBool("IgnoreGamelist", true);
@@ -409,6 +410,11 @@ bool parseArgs(int argc, char* argv[])
         }
     }
 
+    if (Settings::getInstance()->getBool("IgnoreGamelist")) {
+        Settings::getInstance()->setBool("ParseGamelistOnly", false);
+        settingsNeedSaving = true;
+    }
+
     return true;
 }
 
diff --git a/es-core/src/Settings.cpp b/es-core/src/Settings.cpp
index b647c2ad8..5e1a18139 100644
--- a/es-core/src/Settings.cpp
+++ b/es-core/src/Settings.cpp
@@ -29,7 +29,6 @@ namespace
         // These options can be set using command-line arguments:
         "WindowWidth",          // Set via --resolution [width] [height]
         "WindowHeight",         // set via --resolution [width] [height]
-        "ParseGamelistOnly"     // --gamelist-only
         "IgnoreGamelist",       // --ignore-gamelist
         "SplashScreen",         // --no-splash
         "Debug",                // --debug
@@ -359,7 +358,7 @@ void Settings::loadFile()
     pugi::xml_parse_result result = doc.load_file(configFile.c_str());
 #endif
     if (!result) {
-        LOG(LogError) << "Could not parse the es_settings.xml file\n   " << result.description();
+        LOG(LogError) << "Couldn't parse the es_settings.xml file: " << result.description();
         return;
     }