diff --git a/gdk/win32/gdkcairocontext-win32.c b/gdk/win32/gdkcairocontext-win32.c
index c3bcf94c3a..9fe8194bd9 100644
--- a/gdk/win32/gdkcairocontext-win32.c
+++ b/gdk/win32/gdkcairocontext-win32.c
@@ -68,7 +68,7 @@ gdk_win32_cairo_context_begin_frame (GdkDrawContext  *draw_context,
   surface = gdk_draw_context_get_surface (draw_context);
   scale = gdk_surface_get_scale_factor (surface);
 
-  queued_hwnd_rect = gdk_win32_surface_handle_queued_move_resize (draw_context);
+  queued_hwnd_rect = gdk_win32_surface_handle_queued_move_resize (surface);
 
   width = queued_hwnd_rect.right - queued_hwnd_rect.left;
   height = queued_hwnd_rect.bottom - queued_hwnd_rect.top;
diff --git a/gdk/win32/gdkglcontext-win32-egl.c b/gdk/win32/gdkglcontext-win32-egl.c
index 69d58f4ee3..2f62fd6bd9 100644
--- a/gdk/win32/gdkglcontext-win32-egl.c
+++ b/gdk/win32/gdkglcontext-win32-egl.c
@@ -114,7 +114,9 @@ gdk_win32_gl_context_egl_begin_frame (GdkDrawContext  *draw_context,
                                       GdkColorState  **out_color_state,
                                       GdkMemoryDepth  *out_depth)
 {
-  gdk_win32_surface_handle_queued_move_resize (draw_context);
+  GdkSurface *surface = gdk_draw_context_get_surface (draw_context);
+
+  gdk_win32_surface_handle_queued_move_resize (surface);
 
   GDK_DRAW_CONTEXT_CLASS (gdk_win32_gl_context_egl_parent_class)->begin_frame (draw_context, depth, update_area, out_color_state, out_depth);
 }
diff --git a/gdk/win32/gdkglcontext-win32-wgl.c b/gdk/win32/gdkglcontext-win32-wgl.c
index 5b00bb48b4..a005c4265d 100644
--- a/gdk/win32/gdkglcontext-win32-wgl.c
+++ b/gdk/win32/gdkglcontext-win32-wgl.c
@@ -189,7 +189,7 @@ gdk_win32_gl_context_wgl_begin_frame (GdkDrawContext  *draw_context,
                                       GdkColorState  **out_color_state,
                                       GdkMemoryDepth  *out_depth)
 {
-  gdk_win32_surface_handle_queued_move_resize (draw_context);
+  gdk_win32_surface_handle_queued_move_resize (gdk_draw_context_get_surface (draw_context));
 
   GDK_DRAW_CONTEXT_CLASS (gdk_win32_gl_context_wgl_parent_class)->begin_frame (draw_context, depth, update_area, out_color_state, out_depth);
 }
diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c
index fd8f9d0b8e..3ff5626be1 100644
--- a/gdk/win32/gdksurface-win32.c
+++ b/gdk/win32/gdksurface-win32.c
@@ -5117,14 +5117,12 @@ gdk_win32_surface_apply_queued_move_resize (GdkSurface *surface,
 }
 
 RECT
-gdk_win32_surface_handle_queued_move_resize (GdkDrawContext *draw_context)
+gdk_win32_surface_handle_queued_move_resize (GdkSurface *surface)
 {
-  GdkSurface *surface;
   GdkWin32Surface *impl;
   int scale;
   RECT queued_hwnd_rect;
 
-  surface = gdk_draw_context_get_surface (draw_context);
   impl = GDK_WIN32_SURFACE (surface);
   scale = gdk_surface_get_scale_factor (surface);
 
diff --git a/gdk/win32/gdksurface-win32.h b/gdk/win32/gdksurface-win32.h
index de87d9adbc..9786736b76 100644
--- a/gdk/win32/gdksurface-win32.h
+++ b/gdk/win32/gdksurface-win32.h
@@ -357,7 +357,7 @@ void gdk_win32_surface_move_resize (GdkSurface *surface,
 GdkSurface *gdk_win32_drag_surface_new       (GdkDisplay *display);
 
 RECT
-gdk_win32_surface_handle_queued_move_resize (GdkDrawContext *draw_context);
+gdk_win32_surface_handle_queued_move_resize  (GdkSurface *surface);
 
 #ifdef HAVE_EGL
 EGLSurface gdk_win32_surface_get_egl_surface (GdkSurface *surface,
diff --git a/gdk/win32/gdkvulkancontext-win32.c b/gdk/win32/gdkvulkancontext-win32.c
index bf0aeb0865..b4de5a75d0 100644
--- a/gdk/win32/gdkvulkancontext-win32.c
+++ b/gdk/win32/gdkvulkancontext-win32.c
@@ -63,7 +63,9 @@ gdk_win32_vulkan_context_begin_frame (GdkDrawContext  *draw_context,
                                       GdkColorState  **out_color_state,
                                       GdkMemoryDepth  *out_depth)
 {
-  gdk_win32_surface_handle_queued_move_resize (draw_context);
+  GdkSurface *surface = gdk_draw_context_get_surface (draw_context);
+
+  gdk_win32_surface_handle_queued_move_resize (surface);
 
   GDK_DRAW_CONTEXT_CLASS (gdk_win32_vulkan_context_parent_class)->begin_frame (draw_context, depth, update_area, out_color_state, out_depth);
 }