diff --git a/core/core-ui.el b/core/core-ui.el
index 9bd04edf9..f4e3523d8 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -450,10 +450,9 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
 
 (use-package! winner
   ;; undo/redo changes to Emacs' window layout
-  :hook (window-configuration-change . winner-mode)
   :preface (defvar winner-dont-bind-my-keys t) ; I'll bind keys myself
   :config
-  (remove-hook 'window-configuration-change #'winner-mode)
+  (add-hook 'doom-first-buffer-hook #'winner-mode)
   (appendq! winner-boring-buffers
             '("*Compile-Log*" "*inferior-lisp*" "*Fuzzy Completions*"
               "*Apropos*" "*Help*" "*cvs*" "*Buffer List*" "*Ibuffer*"