diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el
index cfccdf6a5..12736f5ea 100644
--- a/modules/feature/evil/config.el
+++ b/modules/feature/evil/config.el
@@ -235,13 +235,14 @@ across windows."
 (def-package! evil-escape
   :commands evil-escape-mode
   :init
-  (setq evil-escape-excluded-states '(normal visual multiedit emacs)
+  (setq evil-escape-excluded-states '(normal visual multiedit emacs motion)
         evil-escape-excluded-major-modes '(neotree-mode)
         evil-escape-key-sequence "jk"
         evil-escape-delay 0.25)
-
   (add-hook 'emacs-startup-hook #'evil-escape-mode)
   :config
+  ;; no `evil-escape' in minibuffer
+  (push #'minibufferp evil-escape-inhibit-functions)
   (map! :irvo "C-g" #'evil-escape))