diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index 752a941c59d54a472baf3dae92bdd3f21ae7b1cb..46ce9eb97fc7641c3052ee3581a3e7d2cbff1684 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -1493,6 +1493,7 @@ impl View for Pane {
                 .last_focused_view
                 .as_ref()
                 .and_then(|handle| handle.upgrade(cx))
+                .filter(|handle| handle.id() != self.tab_bar_context_menu.id())
             {
                 cx.focus(last_focused_view);
             } else {