diff --git a/main.js b/main.js
index 5fc463a88..480194b2d 100644
--- a/main.js
+++ b/main.js
@@ -479,7 +479,11 @@ function showPasswordWindow() {
     }
 
     passwordWindow.readyForShutdown = true;
-    app.quit();
+
+    // Quit the app if we don't have a main window
+    if (!mainWindow) {
+      app.quit();
+    }
   });
 
   passwordWindow.on('closed', () => {