diff --git a/imports/Spectral/Panel/RoomListPanel.qml b/imports/Spectral/Panel/RoomListPanel.qml
index 00cf0b1..a6125e7 100644
--- a/imports/Spectral/Panel/RoomListPanel.qml
+++ b/imports/Spectral/Panel/RoomListPanel.qml
@@ -54,6 +54,16 @@ Item {
 
         sorters: [
             RoleSorter { roleName: "category" },
+            ExpressionSorter {
+                expression: {
+                    return modelLeft.highlightCount > 0;
+                }
+            },
+            ExpressionSorter {
+                expression: {
+                    return modelLeft.notificationCount > 0;
+                }
+            },
             RoleSorter {
                 roleName: "lastActiveTime"
                 sortOrder: Qt.DescendingOrder