diff --git a/src/dnd.c b/src/dnd.c
index 7d62ca70..e69a8548 100644
--- a/src/dnd.c
+++ b/src/dnd.c
@@ -32,7 +32,8 @@ handle_surface_commit(struct wl_listener *listener, void *data)
 	struct wlr_scene_tree *surface_tree = self->icon->data;
 	if (surface_tree) {
 		wlr_scene_node_set_position(&surface_tree->node,
-			surface->sx, surface->sy);
+			surface_tree->node.x + surface->current.dx,
+			surface_tree->node.y + surface->current.dy);
 	}
 }
 
diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap
index bbd05642..a767d442 100644
--- a/subprojects/wlroots.wrap
+++ b/subprojects/wlroots.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://gitlab.freedesktop.org/wlroots/wlroots.git
-revision = 9f793d350379872aeee56ea5c476adfeedc8bc88
+revision = 258bf9be1e44d8a2fb953d727ff4ffcf9ebd6503
 
 [provide]
 dependency_names = wlroots