diff --git a/internal/action/actions.go b/internal/action/actions.go
index 892bc555..17875c69 100644
--- a/internal/action/actions.go
+++ b/internal/action/actions.go
@@ -932,6 +932,9 @@ func (h *BufPane) find(useRegex bool) bool {
 		eventCallback(pattern)
 	}
 	InfoBar.Prompt(prompt, pattern, "Find", eventCallback, findCallback)
+	if pattern != "" {
+		InfoBar.SelectAll()
+	}
 	return true
 }