diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml
index 27d0cbc8..10a10954 100644
--- a/components/PasswordDialog.qml
+++ b/components/PasswordDialog.qml
@@ -62,7 +62,7 @@ Item {
         capsLockTextLabel.visible = oshelper.isCapsLock();
         passwordInput1.reset();
         passwordInput2.reset();
-        if(appWindow.active)
+        if(!appWindow.currentWallet || appWindow.active)
             passwordInput1.input.forceActiveFocus();
         root.walletName = walletName ? walletName : ""
         errorTextLabel.text = errorText ? errorText : "";