diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index 9dcf34431..f6d8d8185 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -17,6 +17,17 @@
   ;; Fix frame-switching key on MacOS
   (global-set-key (kbd "M-`") #'other-frame))
 
+;;
+;; Minibuffer keybindings
+
+;; CUA keys in minibuffer
+(define-key! :keymaps +default-minibuffer-maps
+  [escape] #'abort-recursive-edit
+  "C-v"    #'yank
+  "C-z"    (λ! (ignore-errors (call-interactively #'undo)))
+  "C-a"    #'move-beginning-of-line
+  "C-b"    #'backward-word)
+
 ;;
 ;; Global keybindings
 
diff --git a/modules/config/default/config.el b/modules/config/default/config.el
index f5b21abf3..1717ae924 100644
--- a/modules/config/default/config.el
+++ b/modules/config/default/config.el
@@ -114,15 +114,9 @@
   (define-key input-decode-map (kbd "TAB") [tab]))
 (add-hook 'tty-setup-hook #'+default|setup-input-decode-map)
 
-;; Restore CUA keys in minibuffer
+;; A Doom convention where C-s on popups and interactive searches will invoke
+;; ivy/helm for their superior filtering.
 (define-key! :keymaps +default-minibuffer-maps
-  [escape] #'abort-recursive-edit
-  "C-v"    #'yank
-  "C-z"    (λ! (ignore-errors (call-interactively #'undo)))
-  "C-a"    #'move-beginning-of-line
-  "C-b"    #'backward-word
-  ;; A Doom convention where C-s on popups and interactive searches will invoke
-  ;; ivy/helm for their superior filtering.
   "C-s"    (if (featurep! :completion ivy)
                #'counsel-minibuffer-history
              #'helm-minibuffer-history))