diff --git a/src/qml/UserInfo.qml b/src/qml/UserInfo.qml
index a1f659845..4b18e6772 100644
--- a/src/qml/UserInfo.qml
+++ b/src/qml/UserInfo.qml
@@ -27,6 +27,13 @@ RowLayout {
     Layout.bottomMargin: Kirigami.Units.smallSpacing
     Layout.minimumHeight: bottomEdge ? Kirigami.Units.gridUnit * 2 - 2 : -1 // HACK: -2 here is to ensure the ChatBox and the UserInfo have the same height
 
+    onVisibleChanged: {
+        if (!visible) {
+            accountsPopup.close();
+            switchUserButton.checked = false;
+        }
+    }
+
     QQC2.AbstractButton {
         id: accountButton