From 56d4a7f58e2a5622447191b0ebc779f2db26e07d Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 25 Nov 2025 12:24:04 -0800
Subject: [PATCH] macos: start_search refocuses the search input

---
 macos/Sources/Ghostty/Ghostty.App.swift | 6 +++++-
 macos/Sources/Ghostty/Package.swift     | 3 +++
 macos/Sources/Ghostty/SurfaceView.swift | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/macos/Sources/Ghostty/Ghostty.App.swift b/macos/Sources/Ghostty/Ghostty.App.swift
index 8b6bf8608..42b146754 100644
--- a/macos/Sources/Ghostty/Ghostty.App.swift
+++ b/macos/Sources/Ghostty/Ghostty.App.swift
@@ -1662,7 +1662,11 @@ extension Ghostty {
 
                 let startSearch = Ghostty.Action.StartSearch(c: v)
                 DispatchQueue.main.async {
-                    surfaceView.searchState = Ghostty.SurfaceView.SearchState(from: startSearch)
+                    if surfaceView.searchState != nil {
+                        NotificationCenter.default.post(name: .ghosttySearchFocus, object: surfaceView)
+                    } else {
+                        surfaceView.searchState = Ghostty.SurfaceView.SearchState(from: startSearch)
+                    }
                 }
 
             default:
diff --git a/macos/Sources/Ghostty/Package.swift b/macos/Sources/Ghostty/Package.swift
index f36b486ba..7ee815caa 100644
--- a/macos/Sources/Ghostty/Package.swift
+++ b/macos/Sources/Ghostty/Package.swift
@@ -396,6 +396,9 @@ extension Notification.Name {
     /// Notification sent when scrollbar updates
     static let ghosttyDidUpdateScrollbar = Notification.Name("com.mitchellh.ghostty.didUpdateScrollbar")
     static let ScrollbarKey = ghosttyDidUpdateScrollbar.rawValue + ".scrollbar"
+
+    /// Focus the search field
+    static let ghosttySearchFocus = Notification.Name("com.mitchellh.ghostty.searchFocus")
 }
 
 // NOTE: I am moving all of these to Notification.Name extensions over time. This
diff --git a/macos/Sources/Ghostty/SurfaceView.swift b/macos/Sources/Ghostty/SurfaceView.swift
index 00eb957ec..7cd37acb7 100644
--- a/macos/Sources/Ghostty/SurfaceView.swift
+++ b/macos/Sources/Ghostty/SurfaceView.swift
@@ -441,6 +441,10 @@ extension Ghostty {
                     }
                     isSearchFieldFocused = true
                 }
+                .onReceive(NotificationCenter.default.publisher(for: .ghosttySearchFocus)) { notification in
+                    guard notification.object as? SurfaceView === surfaceView else { return }
+                    isSearchFieldFocused = true
+                }
                 .background(
                     GeometryReader { barGeo in
                         Color.clear.onAppear {