diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index d5643e092268470e61b54001ab57d83ec7cd9467..84b814e27a702232f5c54a6745b31f42935ca7a5 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -960,7 +960,7 @@
     },
   },
   {
-    "context": "GitPanel && ChangesList",
+    "context": "GitPanel && ChangesList && !GitBranchSelector",
     "bindings": {
       "left": "git_panel::CollapseSelectedEntry",
       "right": "git_panel::ExpandSelectedEntry",
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index e2073c170b375baea22f5018c2c7dba632dd9b05..1ffe011a25b74c6e7fdb30282f86b0667fc54793 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -1031,7 +1031,7 @@
     },
   },
   {
-    "context": "GitPanel && ChangesList",
+    "context": "GitPanel && ChangesList && !GitBranchSelector",
     "use_key_equivalents": true,
     "bindings": {
       "up": "git_panel::PreviousEntry",
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index 32f827259cbcf8bab39a8bbe45a9010d7239e2a7..8ceec7e7f494c352b65a7a1f5aa1ad608eb5ff96 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -955,7 +955,7 @@
     },
   },
   {
-    "context": "GitPanel && ChangesList",
+    "context": "GitPanel && ChangesList && !GitBranchSelector",
     "use_key_equivalents": true,
     "bindings": {
       "up": "git_panel::PreviousEntry",