diff --git a/crates/gpui2/src/window.rs b/crates/gpui2/src/window.rs
index e2f53f7347233241d7363a97ad495dcbcc38fcbe..1c0849785b69b3553bed6fff451c47ecec7c2570 100644
--- a/crates/gpui2/src/window.rs
+++ b/crates/gpui2/src/window.rs
@@ -489,7 +489,6 @@ impl<'a> WindowContext<'a> {
 
         #[cfg(any(test, feature = "test-support"))]
         {
-            println!("invalidating focus");
             self.window.focus_invalidated = true;
         }
 
diff --git a/crates/search2/src/project_search.rs b/crates/search2/src/project_search.rs
index da48625b429b28d39be4a2f52336ac8e7c8357e2..167c6fece282f9d7619780497d8c357f7af2eebf 100644
--- a/crates/search2/src/project_search.rs
+++ b/crates/search2/src/project_search.rs
@@ -378,7 +378,11 @@ impl Render for ProjectSearchView {
 
 impl FocusableView for ProjectSearchView {
     fn focus_handle(&self, cx: &AppContext) -> gpui::FocusHandle {
-        self.results_editor.focus_handle(cx)
+        if self.has_matches() {
+            self.results_editor.focus_handle(cx)
+        } else {
+            self.query_editor.focus_handle(cx)
+        }
     }
 }