2 files changed, 12 insertions, 3 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")
diff --git a/components/kube/contents/ui/AccountsView.qml b/components/kube/contents/ui/AccountsView.qml
index 0547ccac..df88e1f7 100644
--- a/components/kube/contents/ui/AccountsView.qml
+++ b/components/kube/contents/ui/AccountsView.qml
@@ -23,9 +23,8 @@ import QtQuick.Controls 2.0
 import org.kube.framework 1.0 as Kube
 import org.kube.components.accounts 1.0 as KubeAccounts
 
-Rectangle {
+FocusScope {
     id: root
-    color: Kube.Colors.backgroundColor
     //Defines whether more than one account is supported.
     property bool singleAccountMode: false
     //Defines available account types.
@@ -121,6 +120,12 @@ Rectangle {
         }
     }
 
+    onActiveFocusChanged: {
+        if (activeFocus && accountWizard.visible) {
+            accountWizard.forceActiveFocus()
+        }
+    }
+
     //BEGIN AccountWizard
     KubeAccounts.AccountWizard {
         id: accountWizard