diff --git a/modules/ui/doom/config.el b/modules/ui/doom/config.el
index c6a548598..7594758c0 100644
--- a/modules/ui/doom/config.el
+++ b/modules/ui/doom/config.el
@@ -66,7 +66,9 @@
 
   ;; Popup buffers should always be dimmed
   (defun +doom|buffer-mode-off ()
-    (when doom-buffer-mode (doom-buffer-mode -1)))
+    (when (and doom-buffer-mode
+               (not (get-buffer-window-list)))
+      (doom-buffer-mode -1)))
   (add-hook 'doom-popup-mode-hook '+doom|buffer-mode-off)
 
   (when (featurep! :feature workspaces)