diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index 00a8e025a..1ccc59f81 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -1,17 +1,12 @@
 ;;; config/default/+bindings.el -*- lexical-binding: t; -*-
 
 (when (featurep! :editor evil +everywhere)
-  ;; `evil' provides `C-u' (bound to `evil-delete-back-to-indentation')
   ;; NOTE SPC u replaces C-u as the universal argument.
-  (map! :i "C-w" #'backward-kill-word
-        ;; Vimmish ex motion keys
-        :i "C-b" #'backward-word
-        :i "C-f" #'forward-word)
 
   ;; Minibuffer
   (define-key! evil-ex-completion-map
-    "C-a" #'move-beginning-of-line
-    "C-b" #'backward-word
+    "C-a" #'evil-beginning-of-line
+    "C-b" #'evil-backward-char
     "C-s" (if (featurep! :completion ivy)
               #'counsel-minibuffer-history
             #'helm-minibuffer-history))
@@ -19,12 +14,10 @@
   (define-key! :keymaps +default-minibuffer-maps
     [escape] #'abort-recursive-edit
     "C-a"    #'move-beginning-of-line
-    "C-b"    #'backward-word
-    "C-f"    #'forward-word
     "C-r"    #'evil-paste-from-register
     "C-u"    #'evil-delete-back-to-indentation
     "C-v"    #'yank
-    "C-w"    #'backward-kill-word
+    "C-w"    #'evil-delete-backward-word
     "C-z"    (λ! (ignore-errors (call-interactively #'undo)))
     ;; Scrolling lines
     "C-j"    #'next-line
diff --git a/modules/editor/evil/config.el b/modules/editor/evil/config.el
index c2a2dad43..b526bb5f0 100644
--- a/modules/editor/evil/config.el
+++ b/modules/editor/evil/config.el
@@ -24,6 +24,7 @@ directives. By default, this only recognizes C directives.")
 (defvar evil-want-C-u-scroll t)
 (defvar evil-want-C-u-delete t)
 (defvar evil-want-C-w-scroll t)
+(defvar evil-want-C-w-delete t)
 (defvar evil-want-Y-yank-to-eol t)
 (defvar evil-want-abbrev-expand-on-insert-exit nil)