diff --git a/hw/xwayland/xwayland-window.c b/hw/xwayland/xwayland-window.c
index 5f0b15a37..5719f5dd8 100644
--- a/hw/xwayland/xwayland-window.c
+++ b/hw/xwayland/xwayland-window.c
@@ -229,8 +229,8 @@ xwl_window_enable_viewport(struct xwl_window *xwl_window,
     wp_viewport_set_source(xwl_window->viewport,
                            wl_fixed_from_int(0),
                            wl_fixed_from_int(0),
-                           wl_fixed_from_int(emulated_mode->width * xwl_window->xwl_screen->global_output_scale),
-                           wl_fixed_from_int(emulated_mode->height * xwl_window->xwl_screen->global_output_scale));
+                           wl_fixed_from_int(emulated_mode->width),
+                           wl_fixed_from_int(emulated_mode->height));
     wp_viewport_set_destination(xwl_window->viewport,
                                 xwl_output->width,
                                 xwl_output->height);
@@ -537,7 +537,7 @@ xwl_realize_window(WindowPtr window)
         return FALSE;
 
     if (xwl_screen->rootless && !window->parent) {
-        BoxRec box = { 0, 0, xwl_screen->width, xwl_screen->height };
+        BoxRec box = { 0, 0, xwl_screen->width * xwl_screen->global_output_scale, xwl_screen->height * xwl_screen->global_output_scale};
 
         RegionReset(&window->winSize, &box);
         RegionNull(&window->clipList);