diff --git a/core/core-keybinds.el b/core/core-keybinds.el
index f34b17bf6..c2ed788c7 100644
--- a/core/core-keybinds.el
+++ b/core/core-keybinds.el
@@ -78,6 +78,9 @@ all hooks after it are ignored.")
 
 (global-set-key [remap keyboard-quit] #'doom/escape)
 
+(with-eval-after-load 'eldoc
+  (eldoc-add-command 'doom/escape))
+
 
 ;;
 ;;; General + leader/localleader keys
diff --git a/modules/editor/evil/config.el b/modules/editor/evil/config.el
index 7916509b4..f8f90e37c 100644
--- a/modules/editor/evil/config.el
+++ b/modules/editor/evil/config.el
@@ -115,6 +115,14 @@ directives. By default, this only recognizes C directives.")
 
 
   ;; --- evil hacks -------------------------
+  (after! eldoc
+    ;; Allow eldoc to trigger directly after changing modes
+    (eldoc-add-command 'evil-normal-state
+                       'evil-insert
+                       'evil-change
+                       'evil-delete
+                       'evil-replace))
+
   (unless noninteractive
     (setq save-silently t)
     (add-hook! 'after-save-hook