diff --git a/modules/feature/workspaces/autoload/workspaces.el b/modules/feature/workspaces/autoload/workspaces.el
index 5f10c9695..6dea52f23 100644
--- a/modules/feature/workspaces/autoload/workspaces.el
+++ b/modules/feature/workspaces/autoload/workspaces.el
@@ -255,7 +255,7 @@ workspace to delete."
                   (if (+workspace-exists-p +workspace--last)
                       +workspace--last
                     (car (+workspace-list-names))))
-                 (unless (doom-buffer-frame-predicate (current-buffer))
+                 (unless (doom-buffer-frame-predicate (window-buffer))
                    (switch-to-buffer (doom-fallback-buffer))))
                 (t
                  (+workspace-switch +workspaces-main t)