diff --git a/src/ui/MainRootWindow.qml b/src/ui/MainRootWindow.qml
index 747a38bcba90e7b3f8673d7eb358151583ecc40c..719dfe076ff9df1f01f2253417a5d44c0d811204 100644
--- a/src/ui/MainRootWindow.qml
+++ b/src/ui/MainRootWindow.qml
@@ -192,6 +192,9 @@ ApplicationWindow {
     }
 
     function finishCloseProcess() {
+        if(ScreenTools.isWindows) {
+            hide()
+        }
         QGroundControl.linkManager.shutdown()
         // The above shutdown causes a flurry of activity as the vehicle components are removed. This in turn
         // causes the Windows Version of Qt to crash if you allow the close event to be accepted. In order to prevent
@@ -210,6 +213,10 @@ ApplicationWindow {
         repeat:     false
         onTriggered: {
             reallyClose()
+            if(ScreenTools.isWindows) {
+                // Closing the app while main is hidden doesn't work
+                Qt.callLater(Qt.quit)
+            }
         }
     }