diff --git a/modules/editor/evil/autoload/evil.el b/modules/editor/evil/autoload/evil.el
index f981ef47f..326aec771 100644
--- a/modules/editor/evil/autoload/evil.el
+++ b/modules/editor/evil/autoload/evil.el
@@ -97,7 +97,7 @@ the only window, use evil-window-move-* (e.g. `evil-window-move-far-left')."
   "Invoke and lazy-load `evil-easymotion' without compromising which-key
 integration."
   (interactive)
-  (evilem-default-keybindings "<easymotion>")
+  (require 'evil-easymotion)
   (setq prefix-arg current-prefix-arg)
   (push '(t . easymotion) unread-command-events))
 
diff --git a/modules/editor/evil/config.el b/modules/editor/evil/config.el
index 7f920a335..cb8bc1dad 100644
--- a/modules/editor/evil/config.el
+++ b/modules/editor/evil/config.el
@@ -210,6 +210,7 @@ directives. By default, this only recognizes C directives.")
 (use-package! evil-easymotion
   :commands evilem-create evilem-default-keybindings
   :config
+  (evilem-default-keybindings "<easymotion>")
   ;; Use evil-search backend, instead of isearch
   (evilem-make-motion evilem-motion-search-next #'evil-ex-search-next
                       :bind ((evil-ex-search-highlight-all nil)))
@@ -557,14 +558,20 @@ To change these keys see `+evil-repeat-keys'."
       :textobj "x" #'evil-inner-xml-attr               #'evil-outer-xml-attr
 
       ;; evil-easymotion
-      (:prefix "<easymotion>" ; see `+evil/easymotion'
-        "a" (evilem-create #'evil-forward-arg)
-        "A" (evilem-create #'evil-backward-arg)
-        "s" #'evil-avy-goto-char-2
-        "SPC" (λ!! #'evil-avy-goto-char-timer t)
-        "/" #'evil-avy-goto-char-timer)
+      (:after evil-easymotion
+        (:prefix "<easymotion>" ; see `+evil/easymotion'
+          "a" (evilem-create #'evil-forward-arg)
+          "A" (evilem-create #'evil-backward-arg)
+          "s" #'evil-avy-goto-char-2
+          "w" (evilem-create #'evil-snipe-repeat
+                             :pre-hook (save-excursion (call-interactively #'evil-snipe-f))
+                             :bind ((evil-snipe-scope 'visible)
+                                    (evil-snipe-enable-highlight)
+                                    (evil-snipe-enable-incremental-highlight)))
+          "SPC" (λ!! #'evil-avy-goto-char-timer t)
+          "/" #'evil-avy-goto-char-timer))
 
-      ;; evil-snipe
+        ;; evil-snipe
       (:after evil-snipe
         :map evil-snipe-parent-transient-map
         "C-;" (λ! (require 'evil-easymotion)