diff --git a/src/runner/main.cpp b/src/runner/main.cpp
index 997fd6d84a..99b6560683 100644
--- a/src/runner/main.cpp
+++ b/src/runner/main.cpp
@@ -391,6 +391,10 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
              cmdLine.find("--dont-elevate") != std::string::npos))
         {
             result = runner(elevated, open_settings, settings_window, openOobe);
+
+            // Save settings on closing
+            auto general_settings = get_general_settings();
+            PTSettingsHelper::save_general_settings(general_settings.to_json());
         }
         else
         {
@@ -405,10 +409,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
         result = -1;
     }
 
-    // Save settings on closing
-    auto general_settings = get_general_settings();
-    PTSettingsHelper::save_general_settings(general_settings.to_json());
-
     // We need to release the mutexes to be able to restart the application
     if (msi_mutex)
     {