diff --git a/ChangeLog b/ChangeLog
index 4898fa4364..8760d4170d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-15  Michael Natterer  <mitch@gimp.org>
+
+	* app/widgets/gimpview-popup.c: close the popup when a drag starts.
+
 2006-10-15  Michael Natterer  <mitch@gimp.org>
 
 	Applied slightly modified patch from Martin Nordholts which
diff --git a/app/widgets/gimpview-popup.c b/app/widgets/gimpview-popup.c
index e763879daf..29c7594cdf 100644
--- a/app/widgets/gimpview-popup.c
+++ b/app/widgets/gimpview-popup.c
@@ -66,6 +66,9 @@ static gboolean   gimp_view_popup_button_release (GtkWidget      *widget,
                                                   GimpViewPopup  *popup);
 static void       gimp_view_popup_unmap          (GtkWidget      *widget,
                                                   GimpViewPopup  *popup);
+static void       gimp_view_popup_drag_begin     (GtkWidget      *widget,
+                                                  GdkDragContext *context,
+                                                  GimpViewPopup  *popup);
 static gboolean   gimp_view_popup_timeout        (GimpViewPopup  *popup);
 
 
@@ -121,6 +124,9 @@ gimp_view_popup_show (GtkWidget      *widget,
   g_signal_connect (widget, "unmap",
                     G_CALLBACK (gimp_view_popup_unmap),
                     popup);
+  g_signal_connect (widget, "drag-begin",
+                    G_CALLBACK (gimp_view_popup_drag_begin),
+                    popup);
 
   popup->timeout_id = g_timeout_add (VIEW_POPUP_DELAY,
                                      (GSourceFunc) gimp_view_popup_timeout,
@@ -152,6 +158,9 @@ gimp_view_popup_hide (GimpViewPopup *popup)
   g_signal_handlers_disconnect_by_func (popup->widget,
                                         gimp_view_popup_unmap,
                                         popup);
+  g_signal_handlers_disconnect_by_func (popup->widget,
+                                        gimp_view_popup_drag_begin,
+                                        popup);
 
   gtk_grab_remove (popup->widget);
 
@@ -176,6 +185,14 @@ gimp_view_popup_unmap (GtkWidget     *widget,
   g_object_set_data (G_OBJECT (popup->widget), "gimp-view-popup", NULL);
 }
 
+static void
+gimp_view_popup_drag_begin (GtkWidget      *widget,
+                            GdkDragContext *context,
+                            GimpViewPopup  *popup)
+{
+  g_object_set_data (G_OBJECT (popup->widget), "gimp-view-popup", NULL);
+}
+
 static gboolean
 gimp_view_popup_timeout (GimpViewPopup *popup)
 {