diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c
index 41bf89d9f..099207855 100644
--- a/hw/xwayland/xwayland-screen.c
+++ b/hw/xwayland/xwayland-screen.c
@@ -687,9 +687,9 @@ xwl_screen_roundtrip(struct xwl_screen *xwl_screen)
 {
     int ret;
 
-    ret = wl_display_roundtrip(xwl_screen->display);
-    while (ret >= 0 && xwl_screen->expecting_event)
+    do {
         ret = wl_display_roundtrip(xwl_screen->display);
+    } while (ret >= 0 && xwl_screen->expecting_event);
 
     if (ret < 0)
         xwl_give_up("could not connect to wayland server\n");