diff --git a/examples/compositor/main.c b/examples/compositor/main.c
index 1d3cb237c..2db4199c7 100644
--- a/examples/compositor/main.c
+++ b/examples/compositor/main.c
@@ -33,6 +33,26 @@ static inline int64_t timespec_to_msec(const struct timespec *a) {
 	return (int64_t)a->tv_sec * 1000 + a->tv_nsec / 1000000;
 }
 
+void output_frame_handle_surface(struct sample_state *sample,
+		struct wlr_output *wlr_output, struct timespec *ts,
+		struct wl_resource *_res) {
+	struct wlr_surface *surface = wl_resource_get_user_data(_res);
+	float matrix[16];
+	float transform[16];
+	wlr_surface_flush_damage(surface);
+	if (surface->texture->valid) {
+		wlr_matrix_translate(&transform, 200, 200, 0);
+		wlr_surface_get_matrix(surface, &matrix,
+			&wlr_output->transform_matrix, &transform);
+		wlr_render_with_matrix(sample->renderer, surface->texture, &matrix);
+
+		struct wlr_frame_callback *cb, *cnext;
+		wl_list_for_each_safe(cb, cnext, &surface->frame_callback_list, link) {
+			wl_callback_send_done(cb->resource, timespec_to_msec(ts));
+			wl_resource_destroy(cb->resource);
+		}
+	}
+}
 void handle_output_frame(struct output_state *output, struct timespec *ts) {
 	struct compositor_state *state = output->compositor;
 	struct sample_state *sample = state->data;
@@ -41,24 +61,13 @@ void handle_output_frame(struct output_state *output, struct timespec *ts) {
 	wlr_output_make_current(wlr_output);
 	wlr_renderer_begin(sample->renderer, wlr_output);
 
-	struct wl_resource *_res;
-	float matrix[16];
-	float transform[16];
-	wl_list_for_each(_res, &sample->compositor.surfaces, link) {
-		struct wlr_surface *surface = wl_resource_get_user_data(_res);
-		wlr_surface_flush_damage(surface);
-		if (surface->texture->valid) {
-			wlr_matrix_translate(&transform, 200, 200, 0);
-			wlr_surface_get_matrix(surface, &matrix,
-				&wlr_output->transform_matrix, &transform);
-			wlr_render_with_matrix(sample->renderer, surface->texture, &matrix);
-
-			struct wlr_frame_callback *cb, *cnext;
-			wl_list_for_each_safe(cb, cnext, &surface->frame_callback_list, link) {
-				wl_callback_send_done(cb->resource, timespec_to_msec(ts));
-				wl_resource_destroy(cb->resource);
-			}
-		}
+	struct wlr_wl_shell_surface *wl_shell_surface;
+	wl_list_for_each(wl_shell_surface, &sample->wl_shell.surfaces, link) {
+		output_frame_handle_surface(sample, wlr_output, ts, wl_shell_surface->surface);
+	}
+	struct wlr_xdg_surface_v6 *xdg_surface;
+	wl_list_for_each(xdg_surface, &sample->xdg_shell->surfaces, link) {
+		output_frame_handle_surface(sample, wlr_output, ts, xdg_surface->surface);
 	}
 
 	wlr_renderer_end(sample->renderer);
diff --git a/examples/compositor/wl_compositor.c b/examples/compositor/wl_compositor.c
index e25dddacc..034a7ff0a 100644
--- a/examples/compositor/wl_compositor.c
+++ b/examples/compositor/wl_compositor.c
@@ -9,11 +9,12 @@
 static void destroy_surface_listener(struct wl_listener *listener, void *data) {
 	struct wlr_surface *surface = wl_resource_get_user_data(data);
 	struct wl_compositor_state *state = surface->compositor_data;
+	assert(data == surface->resource);
 
 	struct wl_resource *res = NULL;
 	wl_list_for_each(res, &state->surfaces, link) {
 		if (res == surface->resource) {
-			wl_list_remove(&res->link);
+			wl_list_remove(wl_resource_get_link(res));
 			break;
 		}
 	}
diff --git a/include/wlr/types/wlr_wl_shell.h b/include/wlr/types/wlr_wl_shell.h
index f96cf7023..80583ae97 100644
--- a/include/wlr/types/wlr_wl_shell.h
+++ b/include/wlr/types/wlr_wl_shell.h
@@ -5,12 +5,15 @@
 struct wlr_wl_shell {
 	struct wl_global *wl_global;
 	struct wl_list wl_resources;
+	struct wl_list surfaces;
 
 	void *data;
 };
 
 struct wlr_wl_shell_surface {
+	struct wl_resource *surface;
 	struct wlr_texture *wlr_texture;
+	struct wl_list link;
 
 	void *data;
 };
diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c
index a4fd896ad..d84775d9c 100644
--- a/types/wlr_wl_shell.c
+++ b/types/wlr_wl_shell.c
@@ -73,7 +73,7 @@ struct wl_shell_surface_interface shell_surface_interface = {
 
 static void destroy_shell_surface(struct wl_resource *resource) {
 	struct wlr_wl_shell_surface *state = wl_resource_get_user_data(resource);
-	wl_list_remove(wl_resource_get_link(resource));
+	wl_list_remove(&state->link);
 	free(state);
 }
 
@@ -81,13 +81,16 @@ static void wl_shell_get_shell_surface(struct wl_client *client,
 		struct wl_resource *resource, uint32_t id,
 		struct wl_resource *surface) {
 	struct wlr_texture *wlr_texture = wl_resource_get_user_data(surface);
+	struct wlr_wl_shell *wlr_wl_shell = wl_resource_get_user_data(resource);
 	struct wlr_wl_shell_surface *state =
 		calloc(1, sizeof(struct wlr_wl_shell_surface));
 	state->wlr_texture = wlr_texture;
+	state->surface = surface;
 	struct wl_resource *shell_surface_resource = wl_resource_create(client,
 			&wl_shell_surface_interface, wl_resource_get_version(resource), id);
 	wl_resource_set_implementation(shell_surface_resource,
 			&shell_surface_interface, state, destroy_shell_surface);
+	wl_list_insert(&wlr_wl_shell->surfaces, &state->link);
 }
 
 static struct wl_shell_interface wl_shell_impl = {
@@ -126,8 +129,13 @@ void wlr_wl_shell_init(struct wlr_wl_shell *wlr_wl_shell,
 		struct wl_display *display) {
 	struct wl_global *wl_global = wl_global_create(display,
 		&wl_shell_interface, 1, wlr_wl_shell, wl_shell_bind);
+	if (!wl_global) {
+		// TODO: return failure somehow
+		return;
+	}
 	wlr_wl_shell->wl_global = wl_global;
 	wl_list_init(&wlr_wl_shell->wl_resources);
+	wl_list_init(&wlr_wl_shell->surfaces);
 }
 
 void wlr_wl_shell_destroy(struct wlr_wl_shell *wlr_wl_shell) {
diff --git a/types/wlr_xdg_shell_v6.c b/types/wlr_xdg_shell_v6.c
index 46f1c98ec..465e55d7d 100644
--- a/types/wlr_xdg_shell_v6.c
+++ b/types/wlr_xdg_shell_v6.c
@@ -93,6 +93,7 @@ static const struct zxdg_toplevel_v6_interface zxdg_toplevel_v6_implementation =
 
 static void xdg_surface_destroy(struct wl_resource *resource) {
 	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
+	wl_list_remove(&surface->link);
 	free(surface);
 }