diff --git a/src/nim_status_client.nim b/src/nim_status_client.nim
index 79bf959ab8..749422916c 100644
--- a/src/nim_status_client.nim
+++ b/src/nim_status_client.nim
@@ -76,7 +76,6 @@ proc mainProc() =
 
   var onboarding = onboarding.newController(events)
   onboarding.init()
-  engine.setRootContextProperty("onboardingLogic", onboarding.variant)
   engine.setRootContextProperty("onboardingModel", onboarding.variant)
 
   var profile = profile.newController()
diff --git a/ui/onboarding/KeysMain.qml b/ui/onboarding/KeysMain.qml
index 0db14d340e..4208e961e2 100644
--- a/ui/onboarding/KeysMain.qml
+++ b/ui/onboarding/KeysMain.qml
@@ -77,7 +77,6 @@ Page {
         anchors.horizontalCenter: parent.horizontalCenter
         label: "I'm new, generate me a key"
         background: Rectangle {color: "transparent"}
-        onClicked: onboardingLogic.generateAddresses()
     }
 
 }
diff --git a/ui/onboarding/OnboardingMain.qml b/ui/onboarding/OnboardingMain.qml
index 6f25720b8e..9bab027a5d 100644
--- a/ui/onboarding/OnboardingMain.qml
+++ b/ui/onboarding/OnboardingMain.qml
@@ -52,7 +52,10 @@ Page {
 
         DSM.State {
             id: genKeyState
-            onEntered: genKey.visible = true
+            onEntered: {
+                genKey.visible = true
+                onboardingModel.generateAddresses()
+            }
             onExited: genKey.visible = false
 
            DSM.SignalTransition {