diff --git a/gdk/mir/gdkmir.h b/gdk/mir/gdkmir.h
index a1c15d1a12..273c7fa6e4 100644
--- a/gdk/mir/gdkmir.h
+++ b/gdk/mir/gdkmir.h
@@ -36,4 +36,7 @@ struct MirConnection *gdk_mir_display_get_mir_connection (GdkDisplay *display);
 GDK_AVAILABLE_IN_3_10
 GType gdk_mir_window_get_type (void);
 
+GDK_AVAILABLE_IN_3_16
+MirSurface *gdk_mir_window_get_mir_surface (GdkWindow *window);
+
 #endif /* __GDK_MIR_H__ */
diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
index 418724be42..7d1a53c1f5 100644
--- a/gdk/mir/gdkmirwindowimpl.c
+++ b/gdk/mir/gdkmirwindowimpl.c
@@ -1245,6 +1245,18 @@ gdk_mir_window_impl_set_shadow_width (GdkWindow *window,
   g_printerr ("gdk_mir_window_impl_set_shadow_width window=%p\n", window);
 }
 
+MirSurface *
+gdk_mir_window_get_mir_surface (GdkWindow *window)
+{
+  GdkMirWindowImpl *impl;
+
+  g_return_val_if_fail (GDK_IS_WINDOW_MIR (window), NULL);
+
+  impl = GDK_MIR_WINDOW_IMPL (window->impl);
+
+  return impl->surface;
+}
+
 static void
 gdk_mir_window_impl_class_init (GdkMirWindowImplClass *klass)
 {