diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 6aba27fec8..9585bcdecd 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -277,7 +277,7 @@
     }
   },
   {
-    "context": "MessageEditor > Editor && !use_modifier_to_send",
+    "context": "MessageEditor && !Picker > Editor && !use_modifier_to_send",
     "bindings": {
       "enter": "agent::Chat",
       "ctrl-enter": "agent::ChatWithFollow",
@@ -288,7 +288,7 @@
     }
   },
   {
-    "context": "MessageEditor > Editor && use_modifier_to_send",
+    "context": "MessageEditor && !Picker > Editor && use_modifier_to_send",
     "bindings": {
       "ctrl-enter": "agent::Chat",
       "enter": "editor::Newline",
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index ba903c0782..9a72bc912c 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -318,7 +318,7 @@
     }
   },
   {
-    "context": "MessageEditor > Editor && !use_modifier_to_send",
+    "context": "MessageEditor && !Picker > Editor && !use_modifier_to_send",
     "use_key_equivalents": true,
     "bindings": {
       "enter": "agent::Chat",
@@ -330,7 +330,7 @@
     }
   },
   {
-    "context": "MessageEditor > Editor && use_modifier_to_send",
+    "context": "MessageEditor && !Picker > Editor && use_modifier_to_send",
     "use_key_equivalents": true,
     "bindings": {
       "cmd-enter": "agent::Chat",