diff --git a/ui/main.qml b/ui/main.qml
index 8f5ee8ea5f..ead783193a 100644
--- a/ui/main.qml
+++ b/ui/main.qml
@@ -22,6 +22,7 @@ StatusWindow {
     property bool removeMnemonicAfterLogin: false
     property alias dragAndDrop: dragTarget
     property bool popupOpened: false
+    property bool displayBeforeGetStartedModal: !hasAccounts
 
     Universal.theme: Universal.System
 
@@ -348,7 +349,6 @@ StatusWindow {
     Component {
         id: keysMain
         KeysMain {
-            displayBeforeGetStartedModal: !hasAccounts
             btnGenKey.onClicked: applicationWindow.navigateTo("GenKey")
             btnExistingKey.onClicked: applicationWindow.navigateTo("ExistingKey")
         }
diff --git a/ui/onboarding/ExistingKey.qml b/ui/onboarding/ExistingKey.qml
index 53c5e66688..1fa6f5c065 100644
--- a/ui/onboarding/ExistingKey.qml
+++ b/ui/onboarding/ExistingKey.qml
@@ -29,13 +29,15 @@ Item {
     }
 
     MnemonicRecoverySuccessModal {
+        property bool wentNext: false
         id: recoverySuccessModal
         onButtonClicked: {
+            recoverySuccessModal.wentNext = true
             recoverySuccessModal.close()
             createPasswordModal.open()
         }
         onClosed: function () {
-            if (!enterSeedPhraseModal.wentNext) {
+            if (!recoverySuccessModal.wentNext) {
                 existingKeyView.onClosed()
             }
         }
diff --git a/ui/onboarding/KeysMain.qml b/ui/onboarding/KeysMain.qml
index 0e21841e00..57b7f8a659 100644
--- a/ui/onboarding/KeysMain.qml
+++ b/ui/onboarding/KeysMain.qml
@@ -9,15 +9,16 @@ Page {
     id: page
     property alias btnExistingKey: btnExistingKey
     property alias btnGenKey: btnGenKey
-    property bool displayBeforeGetStartedModal: true
 
     background: Rectangle {
         color: Style.current.background
     }
 
     Component.onCompleted: {
-        if(displayBeforeGetStartedModal)
+        if(displayBeforeGetStartedModal) {
+            displayBeforeGetStartedModal = false
             beforeGetStartedModal.open()
+        }
     }
 
     BeforeGetStartedModal {