diff --git a/modules/feature/popup/config.el b/modules/feature/popup/config.el
index eefd87353..6ab3576a9 100644
--- a/modules/feature/popup/config.el
+++ b/modules/feature/popup/config.el
@@ -84,7 +84,13 @@ deleted.")
   "Active keymap in a session with the popup system enabled. See
 `+popup-mode'.")
 
-(defvar +popup-buffer-mode-map (make-sparse-keymap)
+(defvar +popup-buffer-mode-map
+  (let ((map (make-sparse-keymap)))
+    (when (featurep! :feature evil)
+      ;; for maximum escape coverage in emacs state buffers
+      (define-key map [escape] #'doom/escape)
+      (define-key map (kbd "ESC") #'doom/escape))
+    map)
   "Active keymap in popup windows. See `+popup-buffer-mode'.")