diff --git a/core/core-ui.el b/core/core-ui.el
index 5badb3a87..03d2c1eda 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -532,14 +532,11 @@ instead)."
     (cond ((window-dedicated-p)
            (delete-window))
           ((eq buf (doom-fallback-buffer))
-           (bury-buffer)
-           (when (cdr (get-buffer-window-list))
-             (doom--cycle-real-buffers nil)))
+           (doom--cycle-real-buffers -1))
           ((doom-real-buffer-p buf)
-           (doom--cycle-real-buffers -1)
-           (kill-buffer buf)
-           (when (cdr (get-buffer-window-list))
-             (doom--cycle-real-buffers nil)))
+           (doom--cycle-real-buffers
+            (if (delq buf (doom-real-buffer-list)) -1))
+           (kill-buffer buf))
           (t
            (funcall orig-fn)))))