diff --git a/modules/feature/popup/+hacks.el b/modules/feature/popup/+hacks.el
index 74bebc3d4..cc76bf96d 100644
--- a/modules/feature/popup/+hacks.el
+++ b/modules/feature/popup/+hacks.el
@@ -32,6 +32,69 @@
 ;; External functions
 ;;
 
+(after! eshell
+  (setq eshell-destroy-buffer-when-process-dies t)
+
+  ;; When eshell runs a visual command (see `eshell-visual-commands'), it spawns
+  ;; a term buffer to run it in, but where it spawns it is the problem...
+  (defun +popup*eshell-undedicate-popup (orig-fn &rest args)
+    "Force spawned term buffer to share with the eshell popup (if necessary)."
+    (when (+popup-p)
+      (set-window-dedicated-p nil nil)
+      (add-transient-hook! #'eshell-query-kill-processes :after
+                           (set-window-dedicated-p nil t)))
+    (apply orig-fn args))
+  (advice-add #'eshell-exec-visual :around #'+popup*eshell-undedicate-popup))
+
+
+;; `evil'
+(after! evil
+  (defun +popup*evil-command-window (hist cmd-key execute-fn)
+    "The evil command window has a mind of its own (uses `switch-to-buffer'). We
+monkey patch it to use pop-to-buffer, and to remember the previous window."
+    (when (eq major-mode 'evil-command-window-mode)
+      (user-error "Cannot recursively open command line window"))
+    (dolist (win (window-list))
+      (when (equal (buffer-name (window-buffer win))
+                   "*Command Line*")
+        (kill-buffer (window-buffer win))
+        (delete-window win)))
+    (setq evil-command-window-current-buffer (current-buffer))
+    (ignore-errors (kill-buffer "*Command Line*"))
+    (with-current-buffer (pop-to-buffer "*Command Line*")
+      (setq-local evil-command-window-execute-fn execute-fn)
+      (setq-local evil-command-window-cmd-key cmd-key)
+      (evil-command-window-mode)
+      (evil-command-window-insert-commands hist)))
+
+  (defun +popup*evil-command-window-execute ()
+    "Execute the command under the cursor in the appropriate buffer, rather than
+the command buffer."
+    (interactive)
+    (let ((result (buffer-substring (line-beginning-position)
+                                    (line-end-position)))
+          (execute-fn evil-command-window-execute-fn)
+          (popup (selected-window)))
+      (select-window doom-popup-other-window)
+      (unless (equal evil-command-window-current-buffer (current-buffer))
+        (user-error "Originating buffer is no longer active"))
+      ;; (kill-buffer "*Command Line*")
+      (doom/popup-close popup)
+      (funcall execute-fn result)
+      (setq evil-command-window-current-buffer nil)))
+
+  ;; Make evil-mode cooperate with popups
+  (advice-add #'evil-command-window :override #'+popup*evil-command-window)
+  (advice-add #'evil-command-window-execute :override #'+popup*evil-command-window-execute)
+
+  ;; Don't mess with popups
+  (advice-add #'+evil--window-swap           :around #'+popup*save)
+  (advice-add #'evil-window-move-very-bottom :around #'+popup*save)
+  (advice-add #'evil-window-move-very-top    :around #'+popup*save)
+  (advice-add #'evil-window-move-far-left    :around #'+popup*save)
+  (advice-add #'evil-window-move-far-right   :around #'+popup*save))
+
+
 ;; `help-mode'
 (after! help-mode
   (defun doom--switch-from-popup (location)
@@ -141,6 +204,11 @@ instead of switch-to-buffer-*."
   (advice-add #'persp-load-state-from-file :after #'+popup*persp-mode-restore-popups))
 
 
+;; `multi-term'
+(after! multi-term
+  (setq multi-term-buffer-name "doom terminal"))
+
+
 ;; `wgrep'
 (progn
   ;; close the popup after you're done with a wgrep buffer
diff --git a/modules/feature/popup/config.el b/modules/feature/popup/config.el
index 34c157f0d..5897fb75b 100644
--- a/modules/feature/popup/config.el
+++ b/modules/feature/popup/config.el
@@ -145,9 +145,9 @@ ALIST supports one custom parameter: `size', which will resolve to
   (set! :popup "^\\*Help"
     '((slot . -1) (size . 0.2))
     '((select . t)))
-  (set! :popup "^\\*\\(?:term\\|doom eshell\\)"
+  (set! :popup "^\\*doom \\(?:term\\|eshell\\)"
     '((size . 0.25))
-    '((select . t) (quit) (transient . 0)))
+    '((quit) (transient . 0)))
   (set! :popup "^\\*doom:"
     '((size . 0.35))
     '((select . t) (modeline . t) (quit) (transient))))