diff --git a/modules/emacs/eshell/autoload/eshell.el b/modules/emacs/eshell/autoload/eshell.el
index a1d1f0633..c1974b088 100644
--- a/modules/emacs/eshell/autoload/eshell.el
+++ b/modules/emacs/eshell/autoload/eshell.el
@@ -1,6 +1,6 @@
 ;;; emacs/eshell/autoload/eshell.el -*- lexical-binding: t; -*-
 
-(defvar eshell-buffer-name "*doom eshell*")
+(defvar eshell-buffer-name "*doom:eshell*")
 
 (defvar +eshell-buffers (make-ring 25)
   "List of open eshell buffers.")
diff --git a/modules/ui/popup/config.el b/modules/ui/popup/config.el
index 8f9511f39..d977ce41e 100644
--- a/modules/ui/popup/config.el
+++ b/modules/ui/popup/config.el
@@ -130,22 +130,18 @@ prevent the popup(s) from messing up the UI (or vice versa)."
     '(("^\\*"  :slot 1 :vslot -1 :select t)
       ("^ \\*" :slot 1 :vslot -1 :size +popup-shrink-to-fit)))
   (when (featurep! +defaults)
-    '(("^\\*bin/doom\\*$"
-       :vslot 9999 :size 0.75 :quit 'current :select t :ttl 0)
-      ("^\\*Completions"
+    '(("^\\*Completions"
        :slot -1 :vslot -2 :ttl 0)
-      ("^\\*Compil\\(?:ation\\|e-Log\\)"
-       :vslot -2 :size 0.3 :ttl nil :quit t)
-      ("^\\*\\(?:scratch\\|Messages\\)"
-       :autosave t :ttl nil)
+      ("^\\*\\(?:Compil\\(?:ation\\|e-Log\\)\\|Messages\\)"
+       :vslot -2 :size 0.3  :autosave t :quit t :ttl nil)
+      ("^\\*doom "  ; transient buffers (no interaction required)
+       :vslot -3 :size 0.25 :autosave t :select t             :quit nil :ttl 0)
+      ("^\\*doom:"  ; editing buffers (interaction required)
+       :vslot -4 :size 0.35 :autosave t :select t :modeline t :quit nil :ttl t)
       ("^\\*Man "
-       :size 0.45 :vslot -3 :ttl 0 :quit t :select t)
-      ("^\\*doom \\(?:term\\|eshell\\)"
-       :size 0.25 :vslot -4 :select t :quit nil :ttl 0)
-      ("^\\*doom:"
-       :vslot -5 :size 0.35 :size bottom :autosave t :select t :modeline t :quit nil)
+       :vslot -5 :size 0.45 :select t :quit t :ttl 0)
       ("^\\*\\(?:\\(?:Pp E\\|doom e\\)val\\)"
-       :size +popup-shrink-to-fit :ttl 0 :select ignore)
+       :size +popup-shrink-to-fit :select ignore :ttl 0)
       ("^\\*Customize"
        :slot 2 :side right :select t :quit t)
       ("^ \\*undo-tree\\*"
@@ -153,11 +149,9 @@ prevent the popup(s) from messing up the UI (or vice versa)."
       ;; `help-mode', `helpful-mode'
       ("^\\*[Hh]elp"
        :slot 2 :vslot -2 :size 0.35 :select t)
-      ;; `eww' (and used by dash docsets)
-      ("^\\*eww\\*"
+      ("^\\*eww\\*"  ; `eww' (and used by dash docsets)
        :vslot -11 :size 0.35 :select t)
-      ;; `Info-mode'
-      ("^\\*info\\*$"
+      ("^\\*info\\*$"  ; `Info-mode'
        :slot 2 :vslot 2 :size 0.45 :select t)))
   '(("^\\*Backtrace" :vslot 99 :size 0.4 :quit nil)
     ("^\\*CPU-Profiler-Report "    :side bottom :vslot 100 :slot 1 :height 0.4 :width 0.5 :quit nil)