diff --git a/src/gui/tray/CurrentAccountHeaderButton.qml b/src/gui/tray/CurrentAccountHeaderButton.qml
index 322dbaf0d1c2f..7d47c6f72bcab 100644
--- a/src/gui/tray/CurrentAccountHeaderButton.qml
+++ b/src/gui/tray/CurrentAccountHeaderButton.qml
@@ -60,6 +60,18 @@ Button {
         height: Math.min(implicitHeight, maxMenuHeight)
         closePolicy: Menu.CloseOnPressOutsideParent | Menu.CloseOnEscape
 
+        contentItem: ListView {
+            clip: true
+            implicitHeight: contentHeight
+            model: accountMenu.contentModel
+            currentIndex: accountMenu.currentIndex
+            boundsBehavior: Flickable.StopAtBounds
+
+            ScrollBar.vertical: ScrollBar {
+                policy: ScrollBar.AsNeeded
+            }
+        }
+
         onClosed: {
             // HACK: reload account Instantiator immediately by resetting it - could be done better I guess
             // see also onVisibleChanged above