diff --git a/assets/keymaps/default.json b/assets/keymaps/default.json
index fbbb517c93..a0f437cf91 100644
--- a/assets/keymaps/default.json
+++ b/assets/keymaps/default.json
@@ -186,10 +186,10 @@
         }
     },
     {
-        "context": "BufferSearchBar",
+        "context": "BufferSearchBar > Editor",
         "bindings": {
             "escape": "buffer_search::Dismiss",
-            "cmd-f": "buffer_search::FocusEditor",
+            "tab": "buffer_search::FocusEditor",
             "enter": "search::SelectNextMatch",
             "shift-enter": "search::SelectPrevMatch"
         }