diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 2d0f824106..5754404111 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -1910,6 +1910,11 @@ _gdk_x11_window_set_window_scale (GdkWindow *window,
   impl = GDK_WINDOW_IMPL_X11 (window->impl);
 
   impl->window_scale = scale;
+#ifdef HAVE_CAIRO_SURFACE_SET_DEVICE_SCALE
+  if (impl->cairo_surface)
+    cairo_surface_set_device_scale (impl->cairo_surface, impl->window_scale, impl->window_scale);
+#endif
+  _gdk_window_update_size (window);
 
   toplevel = _gdk_x11_window_get_toplevel (window);
   if (toplevel && window->window_type != GDK_WINDOW_FOREIGN)