diff --git a/app/widgets/gimpdnd-xds.c b/app/widgets/gimpdnd-xds.c
index 4902decbf6..5ba24e0806 100644
--- a/app/widgets/gimpdnd-xds.c
+++ b/app/widgets/gimpdnd-xds.c
@@ -105,7 +105,7 @@ gimp_dnd_xds_source_set (GdkDragContext *context,
 
       g_object_unref (untitled);
 
-      gdk_property_change (context->source_window,
+      gdk_property_change (gdk_drag_context_get_source_window (context),
                            property, type, 8, GDK_PROP_MODE_REPLACE,
                            (const guchar *) basename,
                            basename ? strlen (basename) : 0);
@@ -114,7 +114,8 @@ gimp_dnd_xds_source_set (GdkDragContext *context,
     }
   else
     {
-      gdk_property_delete (context->source_window, property);
+      gdk_property_delete (gdk_drag_context_get_source_window (context),
+                           property);
     }
 }
 
@@ -141,7 +142,8 @@ gimp_dnd_xds_save_image (GdkDragContext   *context,
   property = gdk_atom_intern_static_string ("XdndDirectSave0");
   type     = gdk_atom_intern_static_string ("text/plain");
 
-  if (! gdk_property_get (context->source_window, property, type,
+  if (! gdk_property_get (gdk_drag_context_get_source_window (context),
+                          property, type,
                           0, MAX_URI_LEN, FALSE,
                           NULL, NULL, &length, &data))
     return;