1 files changed, 7 insertions, 1 deletions
diff --git a/src/progs/manaplus/actions/actions.cpp b/src/progs/manaplus/actions/actions.cpp
index 92c0f0050..6b7965957 100644
--- a/src/progs/manaplus/actions/actions.cpp
+++ b/src/progs/manaplus/actions/actions.cpp
@@ -433,7 +433,13 @@ impHandler0(quit)
         PopupManager::closePopupMenu();
         return true;
     }
-    else if (quitDialog == nullptr)
+    else if (setupWindow != nullptr)
+    {
+        bool wasVisible = setupWindow->hideWindows();
+        if (wasVisible)
+            return true;
+    }
+    if (quitDialog == nullptr)
     {
         CREATEWIDGETV(quitDialog, QuitDialog,
             &quitDialog);