diff --git a/hw/xwayland/xwayland-present.c b/hw/xwayland/xwayland-present.c
index ff0a560db..43f053dfb 100644
--- a/hw/xwayland/xwayland-present.c
+++ b/hw/xwayland/xwayland-present.c
@@ -773,16 +773,6 @@ xwl_present_check_flip(RRCrtcPtr crtc,
     if (!RegionEqual(&present_window->clipList, &present_window->winSize))
         return FALSE;
 
-#ifdef XWL_HAS_GLAMOR
-    if (xwl_window->xwl_screen->glamor &&
-        !xwl_glamor_check_flip(present_window, pixmap))
-        return FALSE;
-
-    if (!xwl_glamor_supports_implicit_sync(xwl_window->xwl_screen) &&
-        !xwl_window->xwl_screen->explicit_sync)
-        return FALSE;
-#endif /* XWL_HAS_GLAMOR */
-
     /* Can't flip if the window pixmap doesn't match the xwl_window parent
      * window's, e.g. because a client redirected this window or one of its
      * parents.
@@ -798,6 +788,16 @@ xwl_present_check_flip(RRCrtcPtr crtc,
     if (!RegionEqual(&xwl_window->toplevel->winSize, &present_window->winSize))
         return FALSE;
 
+#ifdef XWL_HAS_GLAMOR
+    if (!xwl_glamor_supports_implicit_sync(xwl_window->xwl_screen) &&
+        !xwl_window->xwl_screen->explicit_sync)
+        return FALSE;
+
+    if (xwl_window->xwl_screen->glamor &&
+        !xwl_glamor_check_flip(present_window, pixmap))
+        return FALSE;
+#endif /* XWL_HAS_GLAMOR */
+
     return TRUE;
 }