diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el
index 2cf87f2fd..466d5b4a9 100644
--- a/modules/config/default/+emacs-bindings.el
+++ b/modules/config/default/+emacs-bindings.el
@@ -118,8 +118,7 @@
        :desc "Look up in all docsets"       "K" #'+lookup/in-all-docsets
        :desc "Search project"               "p" #'+default/search-project
        :desc "Search other project"         "P" #'+default/search-other-project
-       :desc "Search buffer"                "s" #'swiper-isearch
-       :desc "Search buffer for thing at point" "S" #'swiper-isearch-thing-at-point
+       :desc "Search buffer"                "s" #'+default/search-buffer
        :desc "Dictionary"                   "t" #'+lookup/dictionary-definition
        :desc "Thesaurus"                    "T" #'+lookup/synonyms)
 
diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index 619572d27..c460f8574 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -648,8 +648,7 @@
        :desc "Search project"               "p" #'+default/search-project
        :desc "Search other project"         "P" #'+default/search-other-project
        :desc "Jump to mark"                 "r" #'evil-show-marks
-       :desc "Search buffer"                "s" #'swiper-isearch
-       :desc "Search buffer for thing at point" "S" #'swiper-isearch-thing-at-point
+       :desc "Search buffer"                "s" #'+default/search-buffer
        :desc "Dictionary"                   "t" #'+lookup/dictionary-definition
        :desc "Thesaurus"                    "T" #'+lookup/synonyms)
 
diff --git a/modules/config/default/autoload/search.el b/modules/config/default/autoload/search.el
index cc67e2a06..cc45857b0 100644
--- a/modules/config/default/autoload/search.el
+++ b/modules/config/default/autoload/search.el
@@ -21,6 +21,13 @@ If prefix ARG is set, prompt for a directory to search from."
   (+default/search-cwd 'other))
 
 ;;;###autoload
+(defun +default/search-buffer (&optional arg)
+  (interactive "P")
+  (if (region-active-p)
+      (call-interactively #'swiper-isearch-thing-at-point)
+    (call-interactively #'swiper-isearch)))
+
+;;;autoload
 (defun +default/search-project (&optional arg)
   "Conduct a text search in the current project root.
 If prefix ARG is set, prompt for a known project to search from."