diff --git a/crates/tab_switcher/src/tab_switcher.rs b/crates/tab_switcher/src/tab_switcher.rs
index 67adf2583d8103..1f09a55aecdffa 100644
--- a/crates/tab_switcher/src/tab_switcher.rs
+++ b/crates/tab_switcher/src/tab_switcher.rs
@@ -466,7 +466,11 @@ impl TabSwitcherDelegate {
 
         let selected_item_id = self.selected_item_id();
         self.matches = matches;
-        self.selected_index = self.compute_selected_index(selected_item_id, window, cx);
+        self.selected_index = if query.is_empty() {
+            self.compute_selected_index(selected_item_id, window, cx)
+        } else {
+            0
+        }
     }
 
     fn update_matches(
@@ -525,7 +529,11 @@ impl TabSwitcherDelegate {
             a_score.cmp(&b_score)
         });
 
-        self.selected_index = self.compute_selected_index(selected_item_id, window, cx);
+        self.selected_index = if query.is_empty() {
+            self.compute_selected_index(selected_item_id, window, cx)
+        } else {
+            0
+        }
     }
 
     fn selected_item_id(&self) -> Option<EntityId> {