2 files changed, 7 insertions, 2 deletions

diff --git a/components/package/contents/ui/AccountSwitcher.qml b/components/package/contents/ui/AccountSwitcher.qml
index 5950dab7..b0d48694 100644
--- a/components/package/contents/ui/AccountSwitcher.qml
+++ b/components/package/contents/ui/AccountSwitcher.qml
@@ -79,6 +79,7 @@ Button {
 
                 onClicked: {
                     newAccountComponent.createObject(app)
+                    dialog.visible = false
                 }
 
                 Component {
@@ -103,6 +104,7 @@ Button {
 
                 onClicked: {
                     syncAction.execute()
+                    dialog.visible = false
                 }
             }
         }
@@ -166,6 +168,7 @@ Button {
 
                         onClicked: {
                             editAccountComponent.createObject(app)
+                            dialog.visible = false
                         }
 
                         Component {
diff --git a/components/package/contents/ui/NewAccountDialog.qml b/components/package/contents/ui/NewAccountDialog.qml
index d46728a5..975f7a32 100644
--- a/components/package/contents/ui/NewAccountDialog.qml
+++ b/components/package/contents/ui/NewAccountDialog.qml
@@ -37,8 +37,8 @@ KubeComponents.OverlayDialog {
 
         anchors.centerIn: parent
 
-        height: root.height * 0.8
-        width: root.width * 0.8
+        height: parent.height * 0.8
+        width: parent.width * 0.8
 
         ToolBar {
             id: toolBar
@@ -108,6 +108,7 @@ KubeComponents.OverlayDialog {
 
                             onClicked: {
                                 accountsController.createAccount("imap");
+                                root.closeDialog()
                                 //stack.push(imap)
                             }
                         }
@@ -120,6 +121,7 @@ KubeComponents.OverlayDialog {
 
                             onClicked: {
                                 accountsController.createAccount("maildir");
+                                root.closeDialog()
                                 //stack.push(maildir)
                             }
                         }