diff --git a/modules/ui/workspaces/config.el b/modules/ui/workspaces/config.el
index 6c3d6dea8..a348ac07e 100644
--- a/modules/ui/workspaces/config.el
+++ b/modules/ui/workspaces/config.el
@@ -117,16 +117,15 @@ stored in `persp-save-dir'.")
   ;; add buffers when they are switched to.
   (setq persp-add-buffer-on-find-file nil
         persp-add-buffer-on-after-change-major-mode nil)
-
   (add-hook! '(doom-switch-buffer-hook server-visit-hook)
     (defun +workspaces-add-current-buffer-h ()
       "Add current buffer to focused perspective."
-      (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 (current-buffer) (get-current-persp) nil nil))))))
+      (or (not persp-mode)
+          (persp-buffer-filtered-out-p
+           (or (buffer-base-buffer (current-buffer))
+               (current-buffer))
+           persp-add-buffer-on-after-change-major-mode-filter-functions)
+          (persp-add-buffer (current-buffer) (get-current-persp) nil nil))))
 
   (add-hook 'persp-add-buffer-on-after-change-major-mode-filter-functions
             #'doom-unreal-buffer-p)