diff --git a/core/autoload/buffers.el b/core/autoload/buffers.el
index b5cf4846a..270953133 100644
--- a/core/autoload/buffers.el
+++ b/core/autoload/buffers.el
@@ -257,6 +257,8 @@ If PROJECT-P, kill all buffers that belong to the current project."
   (let ((buffers (if project-p (doom-project-buffer-list) (doom-buffer-list))))
     (mapc #'doom-kill-buffer-and-windows buffers)
     (when (called-interactively-p 'interactive)
+      (unless (doom-real-buffer-p)
+        (switch-to-buffer (doom-fallback-buffer)))
       (message "Killed %s buffers" (length buffers)))))
 
 ;;;###autoload