diff --git a/modules/os/macos/config.el b/modules/os/macos/config.el
index d35eeca43..df70ef5c7 100644
--- a/modules/os/macos/config.el
+++ b/modules/os/macos/config.el
@@ -24,9 +24,10 @@
 
 ;; Sets `ns-transparent-titlebar' and `ns-appearance' frame parameters so window
 ;; borders will match the enabled theme.
-(when (or (daemonp)
-          (display-graphic-p))
-  (add-hook 'doom-load-theme-hook #'ns-auto-titlebar-mode))
+(and (or (daemonp)
+         (display-graphic-p))
+     (require 'ns-auto-titlebar nil t)
+     (ns-auto-titlebar-mode +1))
 
 ;; HACK On MacOS, disabling the menu bar makes MacOS treat Emacs as a
 ;;      non-application window -- which means it doesn't automatically capture