diff --git a/main.js b/main.js
index a555c3b7c..e9393b221 100644
--- a/main.js
+++ b/main.js
@@ -346,6 +346,10 @@ async function createWindow() {
 
   mainWindow.on('focus', () => {
     mainWindow.flashFrame(false);
+    if (passwordWindow) {
+      passwordWindow.close();
+      passwordWindow = null;
+    }
   });
 
   if (config.environment === 'test') {
@@ -1018,11 +1022,6 @@ ipc.on('password-window-login', async (event, passPhrase) => {
     const passwordAttempt = true;
     await showMainWindow(passPhrase, passwordAttempt);
     sendResponse();
-
-    if (passwordWindow) {
-      passwordWindow.close();
-      passwordWindow = null;
-    }
   } catch (e) {
     const localisedError = locale.messages.invalidPassword.message;
     sendResponse(localisedError || 'Invalid password');