diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/MainWindow.qml b/internal/frontend/bridge-gui/bridge-gui/qml/MainWindow.qml
index dcb9b5b7..a1e06bbd 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/MainWindow.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/MainWindow.qml
@@ -106,18 +106,28 @@ ApplicationWindow {
     Connections {
         function onSelectUser(userID, forceShowWindow) {
             contentWrapper.selectUser(userID);
+            if (setupWizard.visible) {
+                setupWizard.closeWizard()
+            }
             if (forceShowWindow) {
                 root.showAndRise();
             }
         }
         function onShowHelp() {
             root.showHelp();
+            if (setupWizard.visible) {
+                setupWizard.closeWizard()
+            }
+
             root.showAndRise();
         }
         function onShowMainWindow() {
             root.showAndRise();
         }
         function onShowSettings() {
+            if (setupWizard.visible) {
+                setupWizard.closeWizard()
+            }
             root.showSettings();
             root.showAndRise();
         }