diff --git a/sway/desktop/wl_shell.c b/sway/desktop/wl_shell.c
index e7150bf36..a7bb8eb5a 100644
--- a/sway/desktop/wl_shell.c
+++ b/sway/desktop/wl_shell.c
@@ -114,7 +114,9 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
 	// - Criteria
 
 	sway_surface->commit.notify = handle_commit;
-	wl_signal_add(&shell_surface->events.commit, &sway_surface->commit);
+	wl_signal_add(&shell_surface->surface->events.commit,
+		&sway_surface->commit);
+
 	sway_surface->destroy.notify = handle_destroy;
 	wl_signal_add(&shell_surface->events.destroy, &sway_surface->destroy);
 
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index 015cc9d04..5ff19f7eb 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -120,7 +120,8 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
 	// - Criteria
 	
 	sway_surface->commit.notify = handle_commit;
-	wl_signal_add(&xdg_surface->events.commit, &sway_surface->commit);
+	wl_signal_add(&xdg_surface->surface->events.commit, &sway_surface->commit);
+
 	sway_surface->destroy.notify = handle_destroy;
 	wl_signal_add(&xdg_surface->events.destroy, &sway_surface->destroy);