diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 0e6f3f9e8..bee706ed0 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -222,10 +222,6 @@
         (:map evil-org-mode-map
           :n  "RET" '+org/dwim-at-point
           ;;
-          :ni "A-l" 'org-metaright
-          :ni "A-h" 'org-metaleft
-          :ni "A-k" 'org-metaup
-          :ni "A-j" 'org-metadown
           :ni "A-L" 'org-shiftmetaright
           :ni "A-H" 'org-shiftmetaleft
           :ni "A-K" 'org-shiftmetaup
diff --git a/modules/private/hlissner/autoload/evil.el b/modules/private/hlissner/autoload/evil.el
index fe4b1ffed..6c2706d15 100644
--- a/modules/private/hlissner/autoload/evil.el
+++ b/modules/private/hlissner/autoload/evil.el
@@ -4,14 +4,14 @@
 (evil-define-motion +hlissner:multi-next-line (count)
   "Move down 6 lines."
   :type line
-  (let ((line-move-visual visual-line-mode))
+  (let ((line-move-visual (or visual-line-mode (derived-mode-p 'text-mode))))
     (evil-line-move (* 6 (or count 1)))))
 
 ;;;###autoload (autoload '+hlissner:multi-previous-line "private/hlissner/autoload/evil" nil t)
 (evil-define-motion +hlissner:multi-previous-line (count)
   "Move up 6 lines."
   :type line
-  (let ((line-move-visual visual-line-mode))
+  (let ((line-move-visual (or visual-line-mode (derived-mode-p 'text-mode))))
     (evil-line-move (- (* 6 (or count 1))))))
 
 ;;;###autoload (autoload '+hlissner:cd "private/hlissner/autoload/evil" nil t)