diff --git a/include/rootston/cursor.h b/include/rootston/cursor.h
index 3bc8c08b..c0dbc010 100644
--- a/include/rootston/cursor.h
+++ b/include/rootston/cursor.h
@@ -94,4 +94,10 @@ void roots_cursor_handle_tool_tip(struct roots_cursor *cursor,
 void roots_cursor_handle_request_set_cursor(struct roots_cursor *cursor,
 		struct wlr_seat_pointer_request_set_cursor_event *event);
 
+void roots_cursor_handle_pointer_grab_begin(struct roots_cursor *cursor,
+		struct wlr_seat_pointer_grab *grab);
+
+void roots_cursor_handle_pointer_grab_end(struct roots_cursor *cursor,
+		struct wlr_seat_pointer_grab *grab);
+
 #endif
diff --git a/rootston/roots_cursor.c b/rootston/roots_cursor.c
index c44b0e7f..c8abe098 100644
--- a/rootston/roots_cursor.c
+++ b/rootston/roots_cursor.c
@@ -302,3 +302,65 @@ void roots_cursor_handle_request_set_cursor(struct roots_cursor *cursor,
 		event->hotspot_y);
 	cursor->cursor_client = event->seat_client->client;
 }
+
+static void handle_drag_icon_commit(struct wl_listener *listener, void *data) {
+	struct roots_drag_icon *drag_icon =
+		wl_container_of(listener, drag_icon, surface_commit);
+	drag_icon->sx += drag_icon->surface->current->sx;
+	drag_icon->sy += drag_icon->surface->current->sy;
+}
+
+static void handle_drag_icon_destroy(struct wl_listener *listener, void *data) {
+	struct roots_drag_icon *drag_icon =
+		wl_container_of(listener, drag_icon, surface_destroy);
+	wl_list_remove(&drag_icon->link);
+	wl_list_remove(&drag_icon->surface_destroy.link);
+	wl_list_remove(&drag_icon->surface_commit.link);
+	free(drag_icon);
+}
+
+void roots_cursor_handle_pointer_grab_begin(struct roots_cursor *cursor,
+		struct wlr_seat_pointer_grab *grab) {
+	struct roots_seat *seat = cursor->seat;
+	if (grab->interface == &wlr_data_device_pointer_drag_interface) {
+		struct wlr_drag *drag = grab->data;
+		if (drag->icon) {
+			struct roots_drag_icon *iter_icon;
+			wl_list_for_each(iter_icon, &seat->drag_icons, link) {
+				if (iter_icon->surface == drag->icon) {
+					// already in the list
+					return;
+				}
+			}
+
+			struct roots_drag_icon *drag_icon =
+				calloc(1, sizeof(struct roots_drag_icon));
+			drag_icon->mapped = true;
+			drag_icon->surface = drag->icon;
+			wl_list_insert(&seat->drag_icons, &drag_icon->link);
+
+			wl_signal_add(&drag->icon->events.destroy,
+				&drag_icon->surface_destroy);
+			drag_icon->surface_destroy.notify = handle_drag_icon_destroy;
+
+			wl_signal_add(&drag->icon->events.commit,
+				&drag_icon->surface_commit);
+			drag_icon->surface_commit.notify = handle_drag_icon_commit;
+		}
+	}
+}
+
+void roots_cursor_handle_pointer_grab_end(struct roots_cursor *cursor,
+		struct wlr_seat_pointer_grab *grab) {
+	if (grab->interface == &wlr_data_device_pointer_drag_interface) {
+		struct wlr_drag *drag = grab->data;
+		struct roots_drag_icon *icon;
+		wl_list_for_each(icon, &cursor->seat->drag_icons, link) {
+			if (icon->surface == drag->icon) {
+				icon->mapped = false;
+			}
+		}
+	}
+
+	roots_cursor_update_position(cursor, 0);
+}
diff --git a/rootston/seat.c b/rootston/seat.c
index 12f12a69..ce8ad10b 100644
--- a/rootston/seat.c
+++ b/rootston/seat.c
@@ -97,6 +97,22 @@ static void handle_request_set_cursor(struct wl_listener *listener,
 	roots_cursor_handle_request_set_cursor(cursor, event);
 }
 
+static void handle_pointer_grab_begin(struct wl_listener *listener,
+		void *data) {
+	struct roots_cursor *cursor =
+		wl_container_of(listener, cursor, pointer_grab_begin);
+	struct wlr_seat_pointer_grab *grab = data;
+	roots_cursor_handle_pointer_grab_begin(cursor, grab);
+}
+
+static void handle_pointer_grab_end(struct wl_listener *listener,
+		void *data) {
+	struct roots_cursor *cursor =
+		wl_container_of(listener, cursor, pointer_grab_end);
+	struct wlr_seat_pointer_grab *grab = data;
+	roots_cursor_handle_pointer_grab_end(cursor, grab);
+}
+
 static void seat_reset_device_mappings(struct roots_seat *seat, struct wlr_input_device *device) {
 	struct wlr_cursor *cursor = seat->cursor->cursor;
 	struct roots_config *config = seat->input->config;
@@ -236,6 +252,14 @@ static void roots_seat_init_cursor(struct roots_seat *seat) {
 	wl_signal_add(&seat->seat->events.request_set_cursor,
 			&seat->cursor->request_set_cursor);
 	seat->cursor->request_set_cursor.notify = handle_request_set_cursor;
+
+	wl_signal_add(&seat->seat->events.pointer_grab_begin,
+			&seat->cursor->pointer_grab_begin);
+	seat->cursor->pointer_grab_begin.notify = handle_pointer_grab_begin;
+
+	wl_signal_add(&seat->seat->events.pointer_grab_end,
+			&seat->cursor->pointer_grab_end);
+	seat->cursor->pointer_grab_end.notify = handle_pointer_grab_end;
 }
 
 struct roots_seat *roots_seat_create(struct roots_input *input, char *name) {