diff --git a/modules/lang/org/autoload/org.el b/modules/lang/org/autoload/org.el
index 143f13d1c..03bac69dd 100644
--- a/modules/lang/org/autoload/org.el
+++ b/modules/lang/org/autoload/org.el
@@ -288,7 +288,10 @@ with `org-cycle'). Also:
   "Indent the current item (header or item), if possible. Made for
 `org-tab-first-hook'."
   (interactive)
-  (cond ((org-at-item-p)
+  (cond ((and (bound-and-true-p evil-mode)
+              (not (eq evil-state 'insert)))
+         nil)
+        ((org-at-item-p)
          (org-indent-item-tree)
          t)
         ((org-at-heading-p)