diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 73af3e169d3c56714d6668fcc3616bee517830c3..86cd70720895812d91b122cadf1262e763c62200 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -625,7 +625,7 @@
     }
   },
   {
-    "context": "AssistantPanel2",
+    "context": "AgentPanel",
     "bindings": {
       "ctrl-n": "assistant2::NewThread",
       "new": "assistant2::NewThread",
@@ -640,7 +640,7 @@
     }
   },
   {
-    "context": "AssistantPanel2 && prompt_editor",
+    "context": "AgentPanel && prompt_editor",
     "use_key_equivalents": true,
     "bindings": {
       "cmd-n": "assistant2::NewPromptEditor",
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 18e1e0580efe682185e7faddd24bbb432a53481f..39821343304568bcb3fda45062dd6d64dfd5620c 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -277,7 +277,7 @@
     }
   },
   {
-    "context": "AssistantPanel2",
+    "context": "AgentPanel",
     "use_key_equivalents": true,
     "bindings": {
       "cmd-n": "assistant2::NewThread",
@@ -292,7 +292,7 @@
     }
   },
   {
-    "context": "AssistantPanel2 && prompt_editor",
+    "context": "AgentPanel && prompt_editor",
     "use_key_equivalents": true,
     "bindings": {
       "cmd-n": "assistant2::NewPromptEditor",
diff --git a/crates/assistant2/src/assistant_panel.rs b/crates/assistant2/src/assistant_panel.rs
index b3ca227e1bb18552fed3a9f8e435cb1244bcdeb9..713c391cdd2957c75351fc3ad0f3e2dc8b89bdd3 100644
--- a/crates/assistant2/src/assistant_panel.rs
+++ b/crates/assistant2/src/assistant_panel.rs
@@ -1182,7 +1182,7 @@ impl AssistantPanel {
 
     fn key_context(&self) -> KeyContext {
         let mut key_context = KeyContext::new_with_defaults();
-        key_context.add("AssistantPanel2");
+        key_context.add("AgentPanel");
         if matches!(self.active_view, ActiveView::PromptEditor) {
             key_context.add("prompt_editor");
         }