diff --git a/modules/ui/tabs/config.el b/modules/ui/tabs/config.el
index d46ea273f..3d89061b7 100644
--- a/modules/ui/tabs/config.el
+++ b/modules/ui/tabs/config.el
@@ -25,11 +25,10 @@
   :config
   (defun +tabs-buffer-list ()
     (seq-filter (lambda (b)
-                  (cond ((eq (current-buffer) b) b)
-                        ((doom-temp-buffer-p b) nil)
-                        ((doom-unreal-buffer-p b) nil)
-                        ((buffer-file-name b) b)
-                        ((buffer-live-p b) b)))
+                  (when (buffer-live-p b)
+                    (or (eq (current-buffer) b)
+                        (and (not (doom-temp-buffer-p b))
+                             (not (doom-unreal-buffer-p b))))))
                 (if (bound-and-true-p persp-mode)
                     (persp-buffer-list)
                   (buffer-list))))