diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 7feaa5b477431bd77842f1b913b1f22c375a1b6f..1a9108f1084a929bec2261f8f94f9ea9ab6b5b04 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -945,7 +945,7 @@
     }
   },
   {
-    "context": "FileFinder",
+    "context": "FileFinder || (FileFinder > Picker > Editor)",
     "bindings": {
       "ctrl-shift-a": "file_finder::ToggleSplitMenu",
       "ctrl-shift-i": "file_finder::ToggleFilterMenu"
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 08cfe751de19518af9ededa35869d9b87e510032..42bba24d6d84da8bb98cbe5b7f80ac711b624ad4 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -1011,7 +1011,7 @@
     }
   },
   {
-    "context": "FileFinder",
+    "context": "FileFinder || (FileFinder > Picker > Editor)",
     "use_key_equivalents": true,
     "bindings": {
       "cmd-shift-a": "file_finder::ToggleSplitMenu",