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