diff --git a/docs/TODO.md b/docs/TODO.md
index 79168d00..3ef0950a 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -1,9 +1,9 @@
 # TODO
 
+- enter in field
 - sfx selection
 - custom action
 
-- fix flickable popups can't be flicked by keyboard
 - seen tooltips can't be shown on image hover
 
 - quick settings
diff --git a/src/config/settings.py b/src/config/settings.py
index 96da9cde..393f7205 100644
--- a/src/config/settings.py
+++ b/src/config/settings.py
@@ -253,10 +253,10 @@ class Keys:
 
     # Toggle muting all notifications in the running client,
     # except highlights (e.g. replies or keywords)
-    notifications_highlights_only = ["Alt+M"]
+    notifications_highlights_only = ["Ctrl+Alt+H"]
 
     # Toggle muting all notifications in the running client
-    notifications_mute = ["Alt+Shift+M"]
+    notifications_mute = ["Ctrl+Alt+N"]
 
     # Toggle the QML developer console. Type ". help" inside it for more info.
     qml_console = ["F1"]
@@ -343,8 +343,8 @@ class Keys:
         # list. What causes a highlight is controlled by push rules
         # (editable in GUI account settings): by default, this includes
         # when your name is mentioned, replied to, or messages with keywords.
-        previous_highlight = ["Alt+Shift+H"]
-        next_highlight     = ["Alt+H"]
+        previous_highlight = ["Alt+Shift+M"]
+        next_highlight     = ["Alt+M"]
 
         class AtIndex:
             # Switch to room number X in the current account.