diff --git a/core/core-popup.el b/core/core-popup.el
index b602a11b7..97282b25a 100644
--- a/core/core-popup.el
+++ b/core/core-popup.el
@@ -15,6 +15,9 @@
           ("*esup*"            :align below :size 0.4 :noselect t)
           ("*minor-modes*"     :align below :size 0.5 :noselect t)
           ("*eval*"            :align below :size 16  :noselect t)
+          ;; Doom
+          ("*doom*"            :align below :size 35  :select t)
+          ("^\\*doom.+\\*$"    :align below :size 12  :noselect t :regexp t)
           ;; Emacs
           ("*Pp Eval Output*"  :align below :size 0.3)
           ("*Apropos*"         :align below :size 0.3)
diff --git a/core/core-scratch.el b/core/core-scratch.el
index 44e83587e..5918d8070 100644
--- a/core/core-scratch.el
+++ b/core/core-scratch.el
@@ -13,9 +13,6 @@
 (defvar-local doom-buffer-edited nil
   "If non-nil, the scratch buffer has been edited.")
 
-(def-popup! "*doom*"                   :align below :size 35 :select t)
-(def-popup! "^\\*doom.+\\*$" :regexp t :align below :size 12 :noselect t)
-
 (define-derived-mode doom-mode fundamental-mode "DOOM"
   "Major mode for special DOOM buffers.")