diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml
index 72a108ce..be4e5334 100644
--- a/wizard/WizardController.qml
+++ b/wizard/WizardController.qml
@@ -349,6 +349,8 @@ Rectangle {
         const handler = function(success) {
             if (!success) {
                 appWindow.showStatusMessage(qsTr("Failed to store the wallet"), 3);
+                wizardStateView.wizardRestoreWallet4View.wizardNav.btnNext.enabled = true;
+                wizardStateView.wizardCreateWallet4View.wizardNav.btnNext.enabled = true;
                 return;
             }
 
diff --git a/wizard/WizardCreateWallet4.qml b/wizard/WizardCreateWallet4.qml
index 33c1e926..8a706bc3 100644
--- a/wizard/WizardCreateWallet4.qml
+++ b/wizard/WizardCreateWallet4.qml
@@ -38,6 +38,7 @@ Rectangle {
 
     color: "transparent"
     property alias pageHeight: pageRoot.height
+    property alias wizardNav: wizardNav
     property string viewName: "wizardCreateWallet4"
 
     ColumnLayout {
@@ -64,6 +65,7 @@ Rectangle {
             WizardSummary {}
 
             WizardNav {
+                id: wizardNav
                 Layout.topMargin: 24
                 btnNextText: qsTr("Create wallet") + translationManager.emptyString
                 progressSteps: appWindow.walletMode <= 1 ? 3 : 4
@@ -77,11 +79,13 @@ Rectangle {
                     }
                 }
                 onNextClicked: {
+                    btnNext.enabled = false;
                     wizardController.wizardStateView.wizardCreateWallet2View.pwField = "";
                     wizardController.wizardStateView.wizardCreateWallet2View.pwConfirmField = "";
                     wizardController.writeWallet(function() {
                         wizardController.useMoneroClicked();
                         wizardController.walletOptionsIsRecoveringFromDevice = false;
+                        btnNext.enabled = true;
                     });
                 }
             }
diff --git a/wizard/WizardRestoreWallet4.qml b/wizard/WizardRestoreWallet4.qml
index 091c143f..4d4c9fdb 100644
--- a/wizard/WizardRestoreWallet4.qml
+++ b/wizard/WizardRestoreWallet4.qml
@@ -38,6 +38,7 @@ Rectangle {
 
     color: "transparent"
     property alias pageHeight: pageRoot.height
+    property alias wizardNav: wizardNav
     property string viewName: "wizardRestoreWallet4"
 
     ColumnLayout {
@@ -64,6 +65,7 @@ Rectangle {
             WizardSummary {}
 
             WizardNav {
+                id: wizardNav
                 Layout.topMargin: 24
                 btnNextText: qsTr("Create wallet") + translationManager.emptyString
                 progressSteps: appWindow.walletMode <= 1 ? 3 : 4
@@ -77,11 +79,13 @@ Rectangle {
                     }
                 }
                 onNextClicked: {
+                    btnNext.enabled = false;
                     wizardController.wizardStateView.wizardRestoreWallet2View.pwField = "";
                     wizardController.wizardStateView.wizardRestoreWallet2View.pwConfirmField = "";
                     wizardController.recoveryWallet();
                     wizardController.writeWallet(function() {
                         wizardController.useMoneroClicked();
+                        btnNext.enabled = true;
                     });
                 }
             }