diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/Bridge.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Bridge.qml
index c19b9f7b..75cc2a6f 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/Bridge.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/Bridge.qml
@@ -89,6 +89,8 @@ QtObject {
         }
 
         onQuit: {
+            mainWindow.hide()
+            trayIcon.visible = false
             Backend.quit()
         }
 
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/StatusWindow.qml b/internal/frontend/bridge-gui/bridge-gui/qml/StatusWindow.qml
index 3fcfb0eb..50bcd1f6 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/StatusWindow.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/StatusWindow.qml
@@ -295,8 +295,8 @@ Window {
                             colorScheme: root.colorScheme
                             text: qsTr("Quit Bridge")
                             onClicked: {
-                                root.quit()
                                 root.close()
+                                root.quit()
                             }
                         }