diff --git a/app/widgets/gimptoolbox.c b/app/widgets/gimptoolbox.c
index ede3df9cd7..e0a7b92a5a 100644
--- a/app/widgets/gimptoolbox.c
+++ b/app/widgets/gimptoolbox.c
@@ -449,13 +449,15 @@ gimp_toolbox_drag_drop (GtkWidget      *widget,
       gtk_drag_get_data (widget, context, target, time);
       dropped = TRUE;
     }
+  else
+    {
+      gtk_drag_finish (context, FALSE,
+                       gdk_drag_context_get_selected_action (context) ==
+                       GDK_ACTION_MOVE,
+                       time);
+    }
 
-  gtk_drag_finish (context, dropped,
-                   gdk_drag_context_get_selected_action (context) ==
-                   GDK_ACTION_MOVE,
-                   time);
-
-  return TRUE;
+  return dropped;
 }
 
 static gchar *