diff --git a/TODO.md b/TODO.md
index 970cdb2e..69d992c2 100644
--- a/TODO.md
+++ b/TODO.md
@@ -3,7 +3,6 @@
   - Copy text with triple click, copy text + name + date with quadruple click
   - Copy to X11 selection
   - Make scroll wheel usable
-  - Clear selection when focusing composer
 
 - Refactoring
   - Banners
diff --git a/src/qml/Base/HSelectableLabelContainer.qml b/src/qml/Base/HSelectableLabelContainer.qml
index e8b2ed0d..1b2c5b3c 100644
--- a/src/qml/Base/HSelectableLabelContainer.qml
+++ b/src/qml/Base/HSelectableLabelContainer.qml
@@ -1,7 +1,10 @@
 import QtQuick 2.12
 import "../utils.js" as Utils
 
-Item {
+FocusScope {
+    onFocusChanged: if (! focus) clearSelection()
+
+
     signal deselectAll()