diff --git a/modules/ui/popup/autoload.el b/modules/ui/popup/autoload.el
index 55b4c4ee2..ec9516fd4 100644
--- a/modules/ui/popup/autoload.el
+++ b/modules/ui/popup/autoload.el
@@ -257,6 +257,21 @@ Uses `shrink-window-if-larger-than-buffer'."
 ;; Minor mode
 ;;
 
+;;;###autoload
+(defvar +popup-mode-map (make-sparse-keymap)
+  "Active keymap in a session with the popup system enabled. See
+`+popup-mode'.")
+
+;;;###autoload
+(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'.")
+
 ;;;###autoload
 (define-minor-mode +popup-mode
   "Global minor mode representing Doom's popup management system."
diff --git a/modules/ui/popup/config.el b/modules/ui/popup/config.el
index 47ab76df9..0c964c4f0 100644
--- a/modules/ui/popup/config.el
+++ b/modules/ui/popup/config.el
@@ -97,19 +97,6 @@ a brief description of some native window parameters that Emacs uses:
   "The default time-to-live for transient buffers whose popup buffers have been
 deleted.")
 
-(defvar +popup-mode-map (make-sparse-keymap)
-  "Active keymap in a session with the popup system enabled. See
-`+popup-mode'.")
-
-(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'.")
-
 
 ;;
 ;; Default popup rules & bootstrap