diff --git a/core/autoload/buffers.el b/core/autoload/buffers.el
index 65c094eb2..c88f6cedb 100644
--- a/core/autoload/buffers.el
+++ b/core/autoload/buffers.el
@@ -286,10 +286,10 @@ belong to the current project."
   (if (null buffer-list)
       (message "No buffers to kill")
     (save-some-buffers)
+    (delete-other-windows)
     (when (memq (current-buffer) buffer-list)
       (switch-to-buffer (doom-fallback-buffer)))
-    (mapc #'doom-kill-buffer-and-windows buffer-list)
-    (delete-other-windows)
+    (mapc #'kill-buffer buffer-list)
     (when interactive
       (message "Killed %s buffers"
                (- (length buffer-list)