diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 83324bd..095f6df 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -21,6 +21,7 @@
 (require 'init-compile)
 (require 'init-editor)
 (require 'init-crux)
+(require 'init-search)
 (require 'init-navigation)
 (require 'init-windows)
 (require 'init-projectile)
diff --git a/.emacs.d/lisp/init-navigation.el b/.emacs.d/lisp/init-navigation.el
index d925545..e483637 100644
--- a/.emacs.d/lisp/init-navigation.el
+++ b/.emacs.d/lisp/init-navigation.el
@@ -2,30 +2,6 @@
 ;;; Commentary:
 ;;; Code:
 
-;; (use-package ctrlf
-;;   :init
-;;   (ctrlf-mode +1)
-;;   :config
-;;   (add-to-list 'ctrlf-minibuffer-bindings '("C-M-g" . ctrlf-cancel))
-;;   (add-to-list 'ctrlf-minibuffer-bindings '("C-o o" . ctrlf-occur))
-;;   (add-to-list 'ctrlf-minibuffer-bindings '("C-o C-o" . ctrlf-occur))
-;;   :custom
-;;   (ctrlf-default-search-style 'fuzzy-regexp)
-;;   (ctrlf-alternate-search-style 'literal)
-;;   :bind
-;;   ("C-S-s" . ctrlf-forward-default)
-;;   ("C-M-g" . ctrlf-cancel) ;; always bind this in case we have left the minibuffer
-;;   ("C-*" . ctrlf-forward-symbol-at-point))
-
-(use-package isearch
-  :ensure nil
-  :custom
-  (search-whitespace-regexp ".*\\b")
-  (isearch-lax-whitespace t)
-  :bind-keymap ("C-c s" . search-map) ;; M-s clashes with paredit/smartparens bindings
-  :bind
-  ("C-*" . isearch-forward-symbol-at-point))
-
 (use-package smartscan
   :config
   (global-smartscan-mode t)
diff --git a/.emacs.d/lisp/init-search.el b/.emacs.d/lisp/init-search.el
new file mode 100644
index 0000000..40b4005
--- /dev/null
+++ b/.emacs.d/lisp/init-search.el
@@ -0,0 +1,28 @@
+;;; init-search.el --- Search Configuration File -*- lexical-binding: t -*-
+;;; Commentary:
+;;; Code:
+
+(use-package isearch
+  :ensure nil
+  :custom
+  (search-whitespace-regexp ".*\\b")
+  (isearch-lax-whitespace t)
+  (isearch-allow-scroll t)
+  ;; TODO
+  ;; (isearch-yank-on-move 'shift)
+  (isearch-yank-on-move t)
+  :bind-keymap ("C-c s" . search-map) ;; M-s clashes with paredit/smartparens bindings
+  :bind
+  ("C-*" . isearch-forward-symbol-at-point)
+  (:map search-map
+   ("M-s M-<" . isearch-beginning-of-buffer)
+   ("M-s M->" . isearch-end-of-buffer)
+   ("C-c s M-<" . isearch-beginning-of-buffer)
+   ("C-c s M->" . isearch-end-of-buffer)))
+
+(use-package isearch-dabbrev
+  :after isearch
+  :bind (:map isearch-mode-map ("M-/" . isearch-dabbrev-expand)))
+
+(provide 'init-search)
+;;; init-search.el ends here