diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el
index 483b65bb8..d474bfca4 100644
--- a/modules/tools/magit/config.el
+++ b/modules/tools/magit/config.el
@@ -82,6 +82,8 @@ It is passed a user and repository name.")
   (evil-define-key* '(normal visual) magit-mode-map
     "zz" #'evil-scroll-line-to-center
     "%"  #'magit-gitflow-popup)
+  ;; Don't use ESC to close magit
+  (evil-define-key* 'normal magit-mode-map [escape] nil)
   (after! git-rebase
     (dolist (key '(("M-k" . "gk") ("M-j" . "gj")))
       (when-let* ((desc (assoc (car key) evil-magit-rebase-commands-w-descriptions)))