diff --git a/modules/ui/workspaces/config.el b/modules/ui/workspaces/config.el
index d54107f29..16ba3b8db 100644
--- a/modules/ui/workspaces/config.el
+++ b/modules/ui/workspaces/config.el
@@ -121,11 +121,12 @@ stored in `persp-save-dir'.")
   (add-hook! '(doom-switch-buffer-hook server-visit-hook)
     (defun +workspaces-add-current-buffer-h ()
       "Add current buffer to focused perspective."
-      (and persp-mode
-           (not (persp-buffer-filtered-out-p
-                 (current-buffer)
-                 persp-add-buffer-on-after-change-major-mode-filter-functions))
-           (persp-add-buffer (current-buffer) (get-current-persp) nil nil))))
+      (when persp-mode
+        (let ((buffer (or (buffer-base-buffer (current-buffer))
+                          (current-buffer))))
+          (or (persp-buffer-filtered-out-p
+               buffer persp-add-buffer-on-after-change-major-mode-filter-functions)
+              (persp-add-buffer buffer (get-current-persp) nil nil))))))
 
   (add-hook 'persp-add-buffer-on-after-change-major-mode-filter-functions
             #'doom-unreal-buffer-p)