diff --git a/spacemacs/keybindings.el b/spacemacs/keybindings.el
index 99e188c63..3ecfbf4c3 100644
--- a/spacemacs/keybindings.el
+++ b/spacemacs/keybindings.el
@@ -176,8 +176,26 @@ Ensure that helm is required before calling FUNC."
   :evil-leader "tl")
 (spacemacs|add-toggle visual-line-navigation
   :status visual-line-mode
-  :on (visual-line-mode)
-  :off (visual-line-mode -1)
+  :on (progn
+        (visual-line-mode)
+        (define-key evil-motion-state-map "j" 'evil-next-visual-line)
+        (define-key evil-motion-state-map "k" 'evil-previous-visual-line)
+        (when (bound-and-true-p evil-escape-mode)
+          (evil-escape-mode -1)
+          (setq evil-escape-motion-state-shadowed-func nil)
+          (define-key evil-motion-state-map "j" 'evil-next-visual-line)
+          (define-key evil-motion-state-map "k" 'evil-previous-visual-line)
+          (evil-escape-mode)))
+  :off (progn
+         (visual-line-mode -1)
+         (define-key evil-motion-state-map "j" 'evil-next-line)
+         (define-key evil-motion-state-map "k" 'evil-previous-line)
+         (when (bound-and-true-p evil-escape-mode)
+           (evil-escape-mode -1)
+           (setq evil-escape-motion-state-shadowed-func nil)
+           (define-key evil-motion-state-map "j" 'evil-next-line)
+           (define-key evil-motion-state-map "k" 'evil-previous-line)
+           (evil-escape-mode)))
   :documentation "Move point according to visual lines."
   :evil-leader "tL")
 (spacemacs|add-toggle line-numbers