diff --git a/wizard/WizardPassword.qml b/wizard/WizardPassword.qml
index adba7a94..3c37c14b 100644
--- a/wizard/WizardPassword.qml
+++ b/wizard/WizardPassword.qml
@@ -56,7 +56,7 @@ Item {
            passwordPage.titleText = qsTr("Give your wallet a password") + translationManager.emptyString
         }
 
-        passwordUI.focus = true;
+        passwordUI.resetFocus()
     }
 
     function onPageClosed(settingsObject) {
diff --git a/wizard/WizardPasswordUI.qml b/wizard/WizardPasswordUI.qml
index c9a4b0c8..42df453c 100644
--- a/wizard/WizardPasswordUI.qml
+++ b/wizard/WizardPasswordUI.qml
@@ -56,6 +56,10 @@ FocusScope {
       privacyLevel.fillLevel = Utils.mapScope(1, 100, 1, 13, strength)      
     }
 
+    function resetFocus() {
+        passwordItem.focus = true
+    }
+
     WizardPasswordInput {
         id: passwordItem
         anchors.horizontalCenter: parent.horizontalCenter