diff --git a/qml/RoomListPage.qml b/qml/RoomListPage.qml
index 1c9170f24..ef9c8a94f 100644
--- a/qml/RoomListPage.qml
+++ b/qml/RoomListPage.qml
@@ -48,11 +48,24 @@ Kirigami.ScrollablePage {
         section.property: "category"
         section.delegate: Kirigami.ListSectionHeader {
             id: sectionHeader
-            label: roomListModel.categoryName(section)
-            MouseArea {
-                Layout.fillWidth: true
-                Layout.fillHeight: true
-                onClicked: roomListModel.setCategoryVisible(section, !roomListModel.categoryVisible(section))
+            action: Kirigami.Action {
+                onTriggered: roomListModel.setCategoryVisible(section, !roomListModel.categoryVisible(section))
+            }
+            contentItem: Item {
+                implicitHeight: categoryName.implicitHeight
+                Kirigami.Heading {
+                    id: categoryName
+                    level: 3
+                    text: roomListModel.categoryName(section)
+                }
+                Kirigami.Icon {
+                    source: roomListModel.categoryVisible(section) ? "go-up" : "go-down"
+                    implicitHeight: Kirigami.Units.iconSizes.small
+                    implicitWidth: Kirigami.Units.iconSizes.small
+                    anchors.left: categoryName.right
+                    anchors.leftMargin: Kirigami.Units.largeSpacing
+                    anchors.verticalCenter: parent.verticalCenter
+                }
             }
         }