diff --git a/resources/qml/Account/AccountWidget.qml b/resources/qml/Account/AccountWidget.qml
index 1b4e6de1b2..d1e285e1da 100644
--- a/resources/qml/Account/AccountWidget.qml
+++ b/resources/qml/Account/AccountWidget.qml
@@ -33,7 +33,7 @@ Button
 
     background: Item {}
 
-    onClicked: popup.open()
+    onClicked: popup.opened ? popup.close() : popup.open()
 
     Popup
     {
@@ -42,6 +42,8 @@ Button
         y: parent.height + UM.Theme.getSize("default_arrow").height
         x: (parent.width - width)
 
+        closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
+
         contentItem: AccountDetails
         {
             id: panel