diff --git a/TODO.md b/TODO.md
index 1b6078a2..9e15ca46 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,8 +1,5 @@
 # TODO
 
-- being able to redact local echos
-- unselect before unfocusing
-
 ## Refactoring
 
 - Rewrite account settings using `HTabbedContainer`
diff --git a/src/gui/Pages/Chat/Timeline/EventList.qml b/src/gui/Pages/Chat/Timeline/EventList.qml
index 270b86b5..f0204f54 100644
--- a/src/gui/Pages/Chat/Timeline/EventList.qml
+++ b/src/gui/Pages/Chat/Timeline/EventList.qml
@@ -18,9 +18,9 @@ Rectangle {
     HShortcut {
         sequences: window.settings.keys.unfocusOrDeselectAllMessages
         onActivated: {
-            eventList.currentIndex !== -1 ?
-            eventList.currentIndex = -1 :
-            eventList.checked = {}
+            eventList.selectedCount ?
+            eventList.checked = {} :
+            eventList.currentIndex = -1
         }
     }