diff --git a/modules/editor/evil/config.el b/modules/editor/evil/config.el
index c0ef17c68..3d81e3e61 100644
--- a/modules/editor/evil/config.el
+++ b/modules/editor/evil/config.el
@@ -122,6 +122,14 @@ directives. By default, this only recognizes C directives.")
         (evil-ex-nohighlight)
         t)))
 
+  ;; REVIEW: Remove if emacs-evil/evil#1971 is addressed.
+  (when evil-respect-visual-line-mode
+    (evil-define-minor-mode-key 'motion 'visual-line-mode
+      [up]   #'evil-previous-visual-line
+      [down] #'evil-next-visual-line
+      [home] #'evil-beginning-of-visual-line
+      [end]  #'evil-end-of-visual-line))
+
 
   ;; --- evil hacks -------------------------
   (after! eldoc