diff --git a/ChangeLog b/ChangeLog
index e2d702b212..a7070cd9c4 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 402b99f05e..286b60d4fc 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -4116,6 +4116,7 @@ gtk_text_view_focus_out_event (GtkWidget *widget, GdkEventFocus *event)
   gtk_widget_queue_draw (widget);
 
   DV(g_print (G_STRLOC": focus_out_event\n"));
+  g_print (G_STRLOC": focus_out_event\n");
   
   if (text_view->cursor_visible && text_view->layout)
     {
@@ -5662,8 +5663,9 @@ 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);
 
   if (button->type == GDK_2BUTTON_PRESS)