2 files changed, 10 insertions, 5 deletions

diff --git a/components/accounts/contents/ui/AccountWizard.qml b/components/accounts/contents/ui/AccountWizard.qml
index 56c975e5..394c3d32 100644
--- a/components/accounts/contents/ui/AccountWizard.qml
+++ b/components/accounts/contents/ui/AccountWizard.qml
@@ -44,12 +44,17 @@ Kube.Popup {
                 stack.push(mainView.createObject(app))
             }
         }
+        onCurrentItemChanged: {
+            if (!!currentItem) {
+                currentItem.forceActiveFocus()
+            }
+        }
     }
 
     Component {
         id: mainView
 
-        Item {
+        FocusScope {
             Kube.Heading {
                 id: heading
                 text: qsTr("Select your new account type")
@@ -67,9 +72,7 @@ Kube.Popup {
                     delegate: Kube.Button {
                         Layout.fillWidth: true
                         text: modelData
-                        onClicked: {
-                            stack.push(wizardPage.createObject(app, {accountType:modelData}))
-                        }
+                        onClicked: stack.push(wizardPage.createObject(app, {accountType:modelData}))
                     }
                 }
             }
@@ -79,6 +82,7 @@ Kube.Popup {
     Component {
         id: wizardPage
         AccountWizardPage {
+            focus: true
             requireSetup: root.requireSetup
             onDone: {
                 root.close()
diff --git a/components/accounts/contents/ui/AccountWizardPage.qml b/components/accounts/contents/ui/AccountWizardPage.qml
index f7885ce4..74decf1f 100644
--- a/components/accounts/contents/ui/AccountWizardPage.qml
+++ b/components/accounts/contents/ui/AccountWizardPage.qml
@@ -24,7 +24,7 @@ import QtQuick.Controls 2.0 as Controls2
 import org.kube.framework 1.0 as Kube
 
 
-Item {
+FocusScope {
     id: root
     property string accountType
     signal done()
@@ -88,6 +88,7 @@ Item {
             Loader {
                 id: loader
                 anchors.fill: parent
+                focus: true
                 source: accountFactory.uiPath
             }
         }