diff --git a/src/layers.c b/src/layers.c
index df556761..849e8d34 100644
--- a/src/layers.c
+++ b/src/layers.c
@@ -412,7 +412,7 @@ create_popup(struct wlr_xdg_popup *wlr_popup, struct wlr_scene_tree *parent)
 		LAB_NODE_DESC_LAYER_POPUP, popup);
 
 	popup->destroy.notify = popup_handle_destroy;
-	wl_signal_add(&wlr_popup->base->events.destroy, &popup->destroy);
+	wl_signal_add(&wlr_popup->events.destroy, &popup->destroy);
 
 	popup->new_popup.notify = popup_handle_new_popup;
 	wl_signal_add(&wlr_popup->base->events.new_popup, &popup->new_popup);
diff --git a/src/xdg-popup.c b/src/xdg-popup.c
index d6bc99f0..c17d195a 100644
--- a/src/xdg-popup.c
+++ b/src/xdg-popup.c
@@ -101,7 +101,7 @@ xdg_popup_create(struct view *view, struct wlr_xdg_popup *wlr_popup)
 	popup->wlr_popup = wlr_popup;
 
 	popup->destroy.notify = handle_xdg_popup_destroy;
-	wl_signal_add(&wlr_popup->base->events.destroy, &popup->destroy);
+	wl_signal_add(&wlr_popup->events.destroy, &popup->destroy);
 
 	popup->new_popup.notify = popup_handle_new_xdg_popup;
 	wl_signal_add(&wlr_popup->base->events.new_popup, &popup->new_popup);
diff --git a/src/xdg.c b/src/xdg.c
index a24de0a8..16474e8f 100644
--- a/src/xdg.c
+++ b/src/xdg.c
@@ -824,9 +824,9 @@ xdg_surface_new(struct wl_listener *listener, void *data)
 	xdg_surface->surface->data = tree;
 
 	view_connect_map(view, xdg_surface->surface);
-	CONNECT_SIGNAL(xdg_surface, view, destroy);
 
 	struct wlr_xdg_toplevel *toplevel = xdg_surface->toplevel;
+	CONNECT_SIGNAL(toplevel, view, destroy);
 	CONNECT_SIGNAL(toplevel, view, request_move);
 	CONNECT_SIGNAL(toplevel, view, request_resize);
 	CONNECT_SIGNAL(toplevel, view, request_minimize);
diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap
index 549c6ca7..7434fb1f 100644
--- a/subprojects/wlroots.wrap
+++ b/subprojects/wlroots.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://gitlab.freedesktop.org/wlroots/wlroots.git
-revision = d61ec694b352c0f21c06958c5ef0417f3e424e3c
+revision = c85838892d56111809aa2edb83a2f22428bfa806
 
 [provide]
 dependency_names = wlroots