diff --git a/core/autoload/buffers.el b/core/autoload/buffers.el
index beaf8b51f..269573274 100644
--- a/core/autoload/buffers.el
+++ b/core/autoload/buffers.el
@@ -105,9 +105,7 @@ If DERIVED-P, test with `derived-mode-p', otherwise use `eq'."
 ;;;###autoload
 (defun doom-visible-windows (&optional window-list)
   "Return a list of the visible, non-popup windows."
-  (cl-loop for win in (or window-list (window-list))
-           unless (doom-popup-p win)
-           collect win))
+  (cl-remove-if #'window-at-side-p (or window-list (window-list))))
 
 ;;;###autoload
 (defun doom-visible-buffers (&optional buffer-list)
diff --git a/modules/feature/workspaces/autoload/workspaces.el b/modules/feature/workspaces/autoload/workspaces.el
index 7aff9382c..f72fc182f 100644
--- a/modules/feature/workspaces/autoload/workspaces.el
+++ b/modules/feature/workspaces/autoload/workspaces.el
@@ -405,16 +405,15 @@ end of the workspace list."
   "Close the selected window. If it's the last window in the workspace, close
 the workspace and move to the next."
   (interactive)
-  (if (doom-popup-p)
-      (doom/popup-close)
-    (let ((current-persp-name (+workspace-current-name)))
-      (cond ((or (+workspace--protected-p current-persp-name)
-                 (> (length (doom-visible-windows)) 1))
-             (if (bound-and-true-p evil-mode)
-                 (evil-window-delete)
-               (delete-window)))
-            ((> (length (+workspace-list-names)) 1)
-             (+workspace/delete current-persp-name))))))
+  (let ((delete-window-fn (if (featurep 'evil) #'evil-window-delete #'delete-window)))
+    (if (window-at-side-p)
+        (funcall delete-window-fn)
+      (let ((current-persp-name (+workspace-current-name)))
+        (cond ((or (+workspace--protected-p current-persp-name)
+                   (cdr (doom-visible-windows)))
+               (funcall delete-window-fn))
+              ((cdr (+workspace-list-names))
+               (+workspace/delete current-persp-name)))))))
 
 ;;;###autoload
 (defun +workspace/close-workspace-or-frame ()
diff --git a/modules/lang/emacs-lisp/autoload.el b/modules/lang/emacs-lisp/autoload.el
index 949a401fc..6b0af7015 100644
--- a/modules/lang/emacs-lisp/autoload.el
+++ b/modules/lang/emacs-lisp/autoload.el
@@ -30,6 +30,6 @@ to a pop up buffer."
       (setq lines (count-lines (point-min) (point-max)))
       (goto-char (point-min))
       (if (> lines 1)
-          (doom-popup-buffer buf)
+          (pop-to-buffer buf t)
         (message "%s" (buffer-substring (point-min) (point-max)))
         (kill-buffer buf)))))