1 files changed, 5 insertions, 1 deletions

diff --git a/components/accounts/contents/ui/AccountWizard.qml b/components/accounts/contents/ui/AccountWizard.qml
index 394c3d32..187741b9 100644
--- a/components/accounts/contents/ui/AccountWizard.qml
+++ b/components/accounts/contents/ui/AccountWizard.qml
@@ -28,7 +28,6 @@ Kube.Popup {
     property var availableAccountPlugins: []
 
     modal: true
-    focus: true
     closePolicy: requireSetup ? Controls2.Popup.NoAutoClose : Controls2.Popup.CloseOnEscape | Controls2.Popup.CloseOnPressOutside
 
     clip: true
@@ -55,6 +54,11 @@ Kube.Popup {
         id: mainView
 
         FocusScope {
+            onActiveFocusChanged: {
+                if (activeFocus) {
+                    layout.children[0].forceActiveFocus(Qt.TabFocusReason)
+                }
+            }
             Kube.Heading {
                 id: heading
                 text: qsTr("Select your new account type")