1 files changed, 12 insertions, 7 deletions
diff --git a/wizard/WizardCreateDevice1.qml b/wizard/WizardCreateDevice1.qml
index 9ad2ca33..81130aa1 100644
--- a/wizard/WizardCreateDevice1.qml
+++ b/wizard/WizardCreateDevice1.qml
@@ -207,13 +207,9 @@ Rectangle {
                         }
                         wizardController.walletOptionsRestoreHeight = _restoreHeight;
                     }
-                    var written = wizardController.createWalletFromDevice();
-                    if(written){
-                        wizardController.walletOptionsIsRecoveringFromDevice = true;
-                        wizardStateView.state = "wizardCreateWallet2";
-                    } else {
-                        errorMsg.text = qsTr("Error writing wallet from hardware device. Check application logs.") + translationManager.emptyString;
-                    }
+
+                    wizardController.walletCreatedFromDevice.connect(onCreateWalletFromDeviceCompleted);
+                    wizardController.createWalletFromDevice();
                 }
             }
         }
@@ -230,4 +226,13 @@ Rectangle {
             walletInput.reset();
         }
     }
+
+    function onCreateWalletFromDeviceCompleted(written){
+        if(written){
+            wizardStateView.state = "wizardCreateWallet2";
+        } else {
+            errorMsg.text = qsTr("Error writing wallet from hardware device. Check application logs.") + translationManager.emptyString;
+        }
+        wizardController.walletCreatedFromDevice.disconnect(onCreateWalletFromDeviceCompleted);
+    }
 }