diff --git a/macos/Sources/Ghostty/SurfaceView.swift b/macos/Sources/Ghostty/SurfaceView.swift
index d8fc68a47..6a0f369c9 100644
--- a/macos/Sources/Ghostty/SurfaceView.swift
+++ b/macos/Sources/Ghostty/SurfaceView.swift
@@ -412,6 +412,11 @@ extension Ghostty {
                         .background(Color.primary.opacity(0.1))
                         .cornerRadius(6)
                         .focused($isSearchFieldFocused)
+                        .onSubmit {
+                            guard let surface = surfaceView.surface else { return }
+                            let action = "navigate_search:next"
+                            ghostty_surface_binding_action(surface, action, UInt(action.count))
+                        }
                         .onExitCommand {
                             Ghostty.moveFocus(to: surfaceView)
                         }
diff --git a/macos/Sources/Ghostty/SurfaceView_AppKit.swift b/macos/Sources/Ghostty/SurfaceView_AppKit.swift
index d4cf61b69..e67a85349 100644
--- a/macos/Sources/Ghostty/SurfaceView_AppKit.swift
+++ b/macos/Sources/Ghostty/SurfaceView_AppKit.swift
@@ -69,7 +69,7 @@ extension Ghostty {
         @Published var searchState: SearchState? = nil {
             didSet {
                 if let searchState {
-                    searchNeedleCancellable = searchState.$needle.sink { [weak self] needle in
+                    searchNeedleCancellable = searchState.$needle.removeDuplicates().sink { [weak self] needle in
                         guard let surface = self?.surface else { return }
                         guard needle.count > 1 else { return }
                         let action = "search:\(needle)"