diff --git a/modules/lang/org/autoload/org.el b/modules/lang/org/autoload/org.el
index ee393bafc..2b5ec31b7 100644
--- a/modules/lang/org/autoload/org.el
+++ b/modules/lang/org/autoload/org.el
@@ -132,6 +132,12 @@
 ;;
 ;;; Commands
 
+;;;###autoload
+(defun +org/return ()
+  "Call `org-return' then indent (if `electric-indent-mode' is on)."
+  (interactive)
+  (org-return electric-indent-mode))
+
 ;;;###autoload
 (defun +org/dwim-at-point (&optional arg)
   "Do-what-I-mean at point.
diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index ae55f0f1e..e27ec73be 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -1169,8 +1169,8 @@ compelling reason, so..."
             ;; more intuitive RET keybinds
             :n [return]   #'+org/dwim-at-point
             :n "RET"      #'+org/dwim-at-point
-            :i [return]   (cmd! (org-return electric-indent-mode))
-            :i "RET"      (cmd! (org-return electric-indent-mode))
+            :i [return]   #'+org/return
+            :i "RET"      #'+org/return
             :i [S-return] #'+org/shift-return
             :i "S-RET"    #'+org/shift-return
             ;; more vim-esque org motion keys (not covered by evil-org-mode)