diff --git a/doom-modeline-core.el b/doom-modeline-core.el
index 0f3765b..395b6b3 100644
--- a/doom-modeline-core.el
+++ b/doom-modeline-core.el
@@ -386,8 +386,8 @@ If DEFAULT is non-nil, set the default mode-line for all buffers."
   (force-mode-line-update))
 
 (add-hook 'window-configuration-change-hook #'doom-modeline-set-selected-window)
+(add-hook 'buffer-list-update-hook #'doom-modeline-set-selected-window)
 (advice-add #'handle-switch-frame :after #'doom-modeline-set-selected-window)
-(advice-add #'select-window :after #'doom-modeline-set-selected-window)
 (advice-add #'make-frame :after #'doom-modeline-set-selected-window)
 (advice-add #'delete-frame :after #'doom-modeline-set-selected-window)
 (with-no-warnings