diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index 0ce223efb4..3662f99b2f 100644
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -857,6 +857,9 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
     while (m_waiting)
         gtk_main_iteration();
 
+    g_signal_handlers_disconnect_by_func (m_iconWindow,
+                                          (gpointer) gtk_dnd_window_configure_callback, this);
+
     return m_retValue;
 }