diff --git a/ChangeLog b/ChangeLog
index 2d5b57fa94..135d70f27d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-12-20  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktextview.c (gtk_text_view_start_selection_drag):
+	Silently return if a drag is already in progress, rather
+	than asserting.  (#335622, Li Yuan, testcase by Erwann Chenede)
+
 	* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_new_with_dialog):
 	Allow any GtkDialog that implements GtkFileChooser as
 	dialog.  (#335473, Tommi Komulainen)
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 359e48abcf..3a88622631 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -5768,7 +5768,8 @@ gtk_text_view_start_selection_drag (GtkTextView       *text_view,
   GtkTextBuffer *buffer;
   SelectionData *data;
 
-  g_assert (text_view->selection_drag_handler == 0);
+  if (text_view->selection_drag_handler != 0)
+    return;
   
   data = g_new0 (SelectionData, 1);