diff --git a/core/autoload/sessions.el b/core/autoload/sessions.el
index b617dedc5..1ba92fd85 100644
--- a/core/autoload/sessions.el
+++ b/core/autoload/sessions.el
@@ -52,7 +52,7 @@
 ;;;###autoload
 (defun doom-restore-session-handler (&rest _)
   "TODO"
-  (doom-load-session))
+  (add-hook 'window-setup-hook #'doom-load-session 'append))
 
 ;;;###autoload
 (add-to-list 'command-switch-alist (cons "--restore" #'doom-restore-session-handler))