2 files changed, 18 insertions, 21 deletions

diff --git a/components/accounts/qml/AccountWizard.qml b/components/accounts/qml/AccountWizard.qml
index 9c4adbe2..58ef4509 100644
--- a/components/accounts/qml/AccountWizard.qml
+++ b/components/accounts/qml/AccountWizard.qml
@@ -85,7 +85,7 @@ Kube.Popup {
             focus: true
             requireSetup: root.requireSetup
             onDone: {
-                root.close()
+                root.destroy()
                 Kube.Fabric.postMessage(Kube.Messages.componentDone, {})
             }
         }
diff --git a/views/accounts/qml/View.qml b/views/accounts/qml/View.qml
index b81579ae..28849ae4 100644
--- a/views/accounts/qml/View.qml
+++ b/views/accounts/qml/View.qml
@@ -50,7 +50,9 @@ FocusScope {
                 }
                 text: qsTr("New Account")
 
-                onClicked: accountWizard.open()
+                onClicked: {
+                    accountWizardComponent.createObject(root, {}).open()
+                }
             }
 
             Kube.ListView {
@@ -112,32 +114,27 @@ FocusScope {
                     //FIXME: this assumes we load accounts synchronously, which we do right now.
                     if (accountId == "") {
                         //Require the setup to be completed since it's the first account
-                        accountWizard.requireSetup = true
-                        //Launch account wizard
-                        accountWizard.open()
+                        accountWizardComponent.createObject(root, {requireSetup: true}).open()
                     }
                 }
             }
         }
     }
 
-    onActiveFocusChanged: {
-        if (activeFocus && accountWizard.visible) {
-            accountWizard.forceActiveFocus()
-        }
-    }
-
     //BEGIN AccountWizard
-    KubeAccounts.AccountWizard {
-        id: accountWizard
-
-        parent: ApplicationWindow.overlay
-        height: root.height
-        width: root.width
-        x: root.mapToGlobal(root.x, root.y).x
-        y: 0
-
-        availableAccountPlugins: root.availableAccountPlugins
+    Component {
+        id: accountWizardComponent
+        KubeAccounts.AccountWizard {
+            id: accountWizard
+
+            parent: ApplicationWindow.overlay
+            height: root.height
+            width: root.width
+            x: root.mapToGlobal(root.x, root.y).x
+            y: 0
+
+            availableAccountPlugins: root.availableAccountPlugins
+        }
     }
     //END AccountWizard
 }