diff --git a/modules/feature/popup/+hacks.el b/modules/feature/popup/+hacks.el
index 53ba593d8..b6e4dde61 100644
--- a/modules/feature/popup/+hacks.el
+++ b/modules/feature/popup/+hacks.el
@@ -74,12 +74,13 @@ the command buffer."
     (let ((result (buffer-substring (line-beginning-position)
                                     (line-end-position)))
           (execute-fn evil-command-window-execute-fn)
+          (execute-window (get-buffer-window evil-command-window-current-buffer))
           (popup (selected-window)))
-      (select-window doom-popup-other-window)
-      (unless (equal evil-command-window-current-buffer (current-buffer))
+      (if execute-window
+          (select-window execute-window)
         (user-error "Originating buffer is no longer active"))
       ;; (kill-buffer "*Command Line*")
-      (doom/popup-close popup)
+      (delete-window popup)
       (funcall execute-fn result)
       (setq evil-command-window-current-buffer nil)))