diff --git a/clients/window.c b/clients/window.c
index 25a5ab523..db07af3c8 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -752,6 +752,12 @@ window_set_surface(struct window *window, cairo_surface_t *surface)
 	window->cairo_surface = surface;
 }
 
+struct wl_surface *
+window_get_wl_surface(struct window *window)
+{
+	return window->surface;
+}
+
 static void
 window_resize_cairo_window_surface(struct window *window)
 {
diff --git a/clients/window.h b/clients/window.h
index f45a28188..85c9ad0bc 100644
--- a/clients/window.h
+++ b/clients/window.h
@@ -184,6 +184,9 @@ window_set_surface(struct window *window, cairo_surface_t *surface);
 void
 window_create_surface(struct window *window);
 
+struct wl_surface *
+window_get_wl_surface(struct window *window);
+
 enum window_buffer_type {
 	WINDOW_BUFFER_TYPE_EGL_WINDOW,
 	WINDOW_BUFFER_TYPE_EGL_IMAGE,