diff --git a/eaf-evil.el b/eaf-evil.el
index ddcc154..048f243 100644
--- a/eaf-evil.el
+++ b/eaf-evil.el
@@ -50,8 +50,8 @@
 
   (add-hook 'evil-normal-state-entry-hook
             (lambda ()
-              (define-key eaf-mode-map (kbd eaf-evil-leader-key) eaf-evil-leader-keymap)
               (when (derived-mode-p 'eaf-mode)
+                (define-key eaf-mode-map (kbd eaf-evil-leader-key) eaf-evil-leader-keymap)
                 (setq emulation-mode-map-alists
                       (delq 'evil-mode-map-alist emulation-mode-map-alists)))))
 
diff --git a/eaf.el b/eaf.el
index 83944f3..fc4621a 100644
--- a/eaf.el
+++ b/eaf.el
@@ -319,7 +319,9 @@ Try not to modify this alist directly.  Use `eaf-setq' to modify instead."
     ("C-y" . "caret_translate_text")
     ("C-q" . "caret_exit")
     ("c"   . "insert_or_caret_at_line")
-    ("M-c" . "caret_toggle_browsing"))
+    ("M-c" . "caret_toggle_browsing")
+    ("<escape>" . "caret_exit")
+    )
   "The keybinding of EAF Browser Caret Mode."
   :type 'cons)