diff --git a/doom-modeline.el b/doom-modeline.el
index dc62a64..0a44477 100644
--- a/doom-modeline.el
+++ b/doom-modeline.el
@@ -393,6 +393,8 @@ active.")
 (add-hook 'window-configuration-change-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
   (cond ((not (boundp 'after-focus-change-function))
          (add-hook 'focus-in-hook  #'doom-modeline-set-selected-window)