diff --git a/src/config/settings.py b/src/config/settings.py
index 9d170da7..9ffe690b 100644
--- a/src/config/settings.py
+++ b/src/config/settings.py
@@ -303,10 +303,12 @@ class Keys:
         previous_unread = ["Alt+Shift+U"]
         next_unread     = ["Alt+U"]
 
-        # Switch to the previous/next room with urgent messages in the list,
-        # e.g. messages mentioning your name, replies to you or keywords.
-        previous_urgent = ["Alt+Shift+M"]
-        next_urgent     = ["Alt+M"]
+        # Switch to the previous/next room with highlighted messages in the
+        # list. What causes a highlight is controlled by push rules
+        # (editable in GUI account settings): by default, this includes
+        # when your name is mentioned, replied to, or messages with keywords.
+        previous_highlight = ["Alt+Shift+M"]
+        next_highlight     = ["Alt+M"]
 
         class AtIndex:
             # Switch to room number X in the current account.
diff --git a/src/gui/MainPane/RoomList.qml b/src/gui/MainPane/RoomList.qml
index 8e12c7b9..d055ff2d 100644
--- a/src/gui/MainPane/RoomList.qml
+++ b/src/gui/MainPane/RoomList.qml
@@ -264,12 +264,12 @@ HListView {
     }
 
     HShortcut {
-        sequences: window.settings.Keys.Rooms.previous_urgent
+        sequences: window.settings.Keys.Rooms.previous_highlight
         onActivated: cycleUnreadRooms(false, true) && showItemLimiter.restart()
     }
 
     HShortcut {
-        sequences: window.settings.Keys.Rooms.next_urgent
+        sequences: window.settings.Keys.Rooms.next_highlight
         onActivated: cycleUnreadRooms(true, true) && showItemLimiter.restart()
     }