diff --git a/core/core-keybinds.el b/core/core-keybinds.el
index 0fca8ca65..0a3495720 100644
--- a/core/core-keybinds.el
+++ b/core/core-keybinds.el
@@ -56,7 +56,7 @@ If any hook returns non-nil, all hooks after it are ignored.")
   ;; embolden local bindings
   (set-face-attribute 'which-key-local-map-description-face nil :weight 'bold)
   (which-key-setup-side-window-bottom)
-  (add-hook 'doom-init-hook #'which-key-mode))
+  (add-hook 'doom-post-init-hook #'which-key-mode))
 
 
 (def-package! hydra
diff --git a/core/core-ui.el b/core/core-ui.el
index bf0bb9439..ad948c254 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -371,7 +371,7 @@ from the default."
   (advice-add #'switch-to-buffer :around #'doom*switch-buffer-hooks)
   (advice-add #'display-buffer   :around #'doom*switch-buffer-hooks)
   (advice-add #'pop-to-buffer    :around #'doom*switch-buffer-hooks))
-(add-hook 'doom-init-hook #'doom|init-custom-hooks)
+(add-hook 'doom-post-init-hook #'doom|init-custom-hooks)
 
 (defun doom*load-theme-hooks (theme &rest _)
   (setq doom-theme theme)
@@ -704,7 +704,7 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
   ;;
   (run-hooks 'doom-init-ui-hook))
 
-(add-hook 'doom-init-hook #'doom|init-ui)
+(add-hook 'doom-post-init-hook #'doom|init-ui)
 
 (provide 'core-ui)
 ;;; core-ui.el ends here