diff --git a/modules/feature/evil/autoload/evil.el b/modules/feature/evil/autoload/evil.el
index 98c432ae0..20fd27355 100644
--- a/modules/feature/evil/autoload/evil.el
+++ b/modules/feature/evil/autoload/evil.el
@@ -358,3 +358,9 @@ more information on modifiers."
   (when (and (not count) evil-auto-balance-windows)
     (balance-windows (window-parent)))
   (if file (evil-edit file)))
+
+;;;###autoload
+(defun +evil*escape (&rest _)
+  "Call `doom/escape' if `evil-force-normal-state' is called interactively."
+  (when (called-interactively-p 'any)
+    (call-interactively #'doom/escape)))
diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el
index 5f3de983a..25ae2790d 100644
--- a/modules/feature/evil/config.el
+++ b/modules/feature/evil/config.el
@@ -120,7 +120,7 @@ variable for an explanation of the defaults (in comments). See
     (setq save-silently t)
     (add-hook 'after-save-hook #'+evil|save-buffer))
   ;; Make ESC (from normal mode) the universal escaper. See `doom-escape-hook'.
-  (advice-add #'evil-force-normal-state :after #'doom/escape)
+  (advice-add #'evil-force-normal-state :after #'+evil*escape)
   ;; Don't move cursor when indenting
   (advice-add #'evil-indent :around #'+evil*static-reindent)
   ;; monkey patch `evil-ex-replace-special-filenames' to improve support for