diff --git a/config-exwm.org b/config-exwm.org
index 632647f..2b7b826 100644
--- a/config-exwm.org
+++ b/config-exwm.org
@@ -69,9 +69,6 @@
       ;; Startup programs
       (add-hook 'exwm-init-hook 'server-start)
 
-      (require 'exwm-screens)
-      (add-hook 'exwm-init-hook 'my/setup-screens)
-
       ;; Reminder: Hooks execute in order. Make sure megasync launches after systemtray is enabled
       (require 'exwm-startup)
       (add-hook 'exwm-init-hook 'call-startup-programs)
@@ -79,6 +76,10 @@
       (require 'exwm-systemtray)
       (exwm-systemtray-enable)
 
+      ;; Setup screens before anything else
+      (require 'exwm-screens)
+      (add-hook 'exwm-init-hook 'my/setup-screens)
+
       ;; This lets me do rapid emacs iteration
       (defun ignore-emacs ()
         (when (and exwm-class-name (string= exwm-class-name "Emacs"))