diff --git a/src/x11/meta-x11-display.c b/src/x11/meta-x11-display.c
index f4f313fa9..9a2f02e9e 100644
--- a/src/x11/meta-x11-display.c
+++ b/src/x11/meta-x11-display.c
@@ -1303,8 +1303,6 @@ meta_x11_display_new (MetaDisplay *display, GError **error)
                                               xroot,
                                               PropertyChangeMask);
 
-  init_event_masks (x11_display);
-
   /* Select for cursor changes so the cursor tracker is up to date. */
   XFixesSelectCursorInput (xdisplay, xroot, XFixesDisplayCursorNotifyMask);
 
@@ -1418,6 +1416,8 @@ meta_x11_display_new (MetaDisplay *display, GError **error)
   x11_display->wm_sn_atom = wm_sn_atom;
   x11_display->wm_sn_timestamp = timestamp;
 
+  init_event_masks (x11_display);
+
   return x11_display;
 }