diff --git a/src/python/config_files.py b/src/python/config_files.py
index bff0dbb3..5642674b 100644
--- a/src/python/config_files.py
+++ b/src/python/config_files.py
@@ -105,6 +105,7 @@ class UISettings(JSONConfigFile):
     async def default_data(self) -> JsonData:
         return {
             "alertOnMessageForMsec": 4000,
+            "clearRoomFilterOnEnter": True,
             "theme": "Default.qpl",
             "writeAliases": {},
             "keys": {
diff --git a/src/qml/SidePane/SidePane.qml b/src/qml/SidePane/SidePane.qml
index 0fc0120b..a5833a47 100644
--- a/src/qml/SidePane/SidePane.qml
+++ b/src/qml/SidePane/SidePane.qml
@@ -89,6 +89,10 @@ Rectangle {
     Keys.onReturnPressed: if (event.modifiers & Qt.ShiftModifier) {
         sidePaneList.toggleCollapseAccount()
     } else {
+        if (window.settings.clearRoomFilterOnEnter) {
+            mainUI.sidePane.toolBar.roomFilter = ""
+        }
+
         sidePaneList.activate()
     }