diff --git a/src/backend/user_files.py b/src/backend/user_files.py
index 0eb58205..a5273a74 100644
--- a/src/backend/user_files.py
+++ b/src/backend/user_files.py
@@ -270,6 +270,7 @@ class UISettings(JSONDataFile):
                     "10": "Alt+0",
                 },
 
+                "unselectAllMessages":         ["Escape"],
                 "clearRoomMessages":           ["Ctrl+L"],
                 "sendFile":                    ["Alt+S"],
                 "sendFileFromPathInClipboard": ["Alt+Shift+S"],
diff --git a/src/gui/Pages/Chat/Timeline/EventList.qml b/src/gui/Pages/Chat/Timeline/EventList.qml
index bffedadb..0904e65d 100644
--- a/src/gui/Pages/Chat/Timeline/EventList.qml
+++ b/src/gui/Pages/Chat/Timeline/EventList.qml
@@ -15,7 +15,7 @@ Rectangle {
 
 
     HShortcut {
-        sequence: "Escape"
+        sequences: window.settings.keys.unselectAllMessages
         onActivated: eventList.checkedDelegates = {}
     }