diff --git a/src/input/ime.c b/src/input/ime.c
index bfb8816f..efbe54d6 100644
--- a/src/input/ime.c
+++ b/src/input/ime.c
@@ -309,7 +309,8 @@ handle_keyboard_grab_destroy(struct wl_listener *listener, void *data)
 {
 	struct input_method_relay *relay =
 		wl_container_of(listener, relay, keyboard_grab_destroy);
-	struct wlr_input_method_keyboard_grab_v2 *keyboard_grab = data;
+	struct wlr_input_method_keyboard_grab_v2 *keyboard_grab =
+		relay->input_method->keyboard_grab;
 	assert(keyboard_grab);
 
 	wl_list_remove(&relay->keyboard_grab_destroy.link);
diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap
index 253b83d7..18e5ef98 100644
--- a/subprojects/wlroots.wrap
+++ b/subprojects/wlroots.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://gitlab.freedesktop.org/wlroots/wlroots.git
-revision = 06aacb2a6fd237a5e1062d611909432bbcf5b566
+revision = 06275103f249cd2954630e59383342e102a6c1a3
 
 [provide]
 dependency_names = wlroots-0.20