diff --git a/src/wayland/meta-wayland-data-device.c b/src/wayland/meta-wayland-data-device.c
index 054bb44ab..7d808c65e 100644
--- a/src/wayland/meta-wayland-data-device.c
+++ b/src/wayland/meta-wayland-data-device.c
@@ -522,7 +522,9 @@ keyboard_drag_grab_key (MetaWaylandKeyboardGrab *grab,
       MetaWaylandDragGrab *drag_grab;
 
       drag_grab = wl_container_of (grab, drag_grab, keyboard_grab);
-      meta_wayland_data_source_cancel (drag_grab->drag_data_source);
+      meta_wayland_data_device_set_dnd_source (&drag_grab->seat->data_device,
+                                               NULL);
+      unset_selection_source (&drag_grab->seat->data_device, META_SELECTION_DND);
       meta_wayland_data_source_set_current_offer (drag_grab->drag_data_source,
                                                   NULL);
       meta_dnd_actor_drag_finish (META_DND_ACTOR (drag_grab->feedback_actor),