diff --git a/src/python/config_files.py b/src/python/config_files.py
index 8d0fd563..e0f7ca29 100644
--- a/src/python/config_files.py
+++ b/src/python/config_files.py
@@ -119,6 +119,7 @@ class UISettings(JSONConfigFile):
                 "scrollUp":         ["Alt+Up", "Alt+K"],
                 "scrollDown":       ["Alt+Down", "Alt+J"],
                 "focusSidePane":    ["Alt+S", "Ctrl+S"],
+                "clearRoomFilter":  ["Alt+Shift+S", "Ctrl+Shift+S"],
                 "goToPreviousRoom": ["Alt+Shift+Up", "Alt+Shift+K"],
                 "goToNextRoom":     ["Alt+Shift+Down", "Alt+Shift+J"],
                 "startDebugger":    ["Alt+Shift+D"],
diff --git a/src/qml/Shortcuts.qml b/src/qml/Shortcuts.qml
index de3d7c5b..bee79026 100644
--- a/src/qml/Shortcuts.qml
+++ b/src/qml/Shortcuts.qml
@@ -41,6 +41,11 @@ Item {
         onActivated: mainUI.sidePane.forceActiveFocus()
     }
 
+    Shortcut {
+        sequences: settings.keys ? settings.keys.clearRoomFilter : []
+        onActivated: mainUI.sidePane.paneToolBar.roomFilter = ""
+    }
+
     Shortcut {
         sequences: settings.keys ? settings.keys.goToPreviousRoom : []
         onActivated: mainUI.sidePane.accountRoomList.previous()