diff --git a/core/core-modeline.el b/core/core-modeline.el
index 3a4456cd3..14f02ad8e 100644
--- a/core/core-modeline.el
+++ b/core/core-modeline.el
@@ -117,7 +117,8 @@ first time."
 (defvar mode-line-selected-window nil)
 (defun doom|set-selected-window (&rest _)
   (let ((window (frame-selected-window)))
-    (unless (minibuffer-window-active-p window)
+    (when (and (windowp window)
+               (not (minibuffer-window-active-p window)))
       (setq mode-line-selected-window window))))
 (add-hook 'window-configuration-change-hook #'doom|set-selected-window)
 (add-hook 'focus-in-hook #'doom|set-selected-window)