diff --git a/crates/assistant2/src/message_editor.rs b/crates/assistant2/src/message_editor.rs
index a75ab6416b..cc3545889a 100644
--- a/crates/assistant2/src/message_editor.rs
+++ b/crates/assistant2/src/message_editor.rs
@@ -241,7 +241,9 @@ impl MessageEditor {
     }
 
     fn move_up(&mut self, _: &MoveUp, cx: &mut ViewContext<Self>) {
-        if self.context_picker_menu_handle.is_deployed() {
+        if self.context_picker_menu_handle.is_deployed()
+            || self.inline_context_picker_menu_handle.is_deployed()
+        {
             cx.propagate();
         } else {
             cx.focus_view(&self.context_strip);