diff --git a/ChangeLog b/ChangeLog
index 983afc53b0..a62bd975cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-06-07  Federico Mena Quintero  <federico@ximian.com>
+
+	Merge from HEAD:
+	
+	* gtk/gtktreeview.c (gtk_tree_view_button_press): Revert the patch
+	from 2003/Sep/12.  This kept DnD in tree views within modal
+	dialogs from working, which is especially bad for the file
+	chooser.  Fixes #135168.
+
 Sat Jun  5 23:07:30 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkentrycompletion.c: (gtk_entry_completion_init),
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 983afc53b0..a62bd975cf 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2004-06-07  Federico Mena Quintero  <federico@ximian.com>
+
+	Merge from HEAD:
+	
+	* gtk/gtktreeview.c (gtk_tree_view_button_press): Revert the patch
+	from 2003/Sep/12.  This kept DnD in tree views within modal
+	dialogs from working, which is especially bad for the file
+	chooser.  Fixes #135168.
+
 Sat Jun  5 23:07:30 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkentrycompletion.c: (gtk_entry_completion_init),
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 983afc53b0..a62bd975cf 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+2004-06-07  Federico Mena Quintero  <federico@ximian.com>
+
+	Merge from HEAD:
+	
+	* gtk/gtktreeview.c (gtk_tree_view_button_press): Revert the patch
+	from 2003/Sep/12.  This kept DnD in tree views within modal
+	dialogs from working, which is especially bad for the file
+	chooser.  Fixes #135168.
+
 Sat Jun  5 23:07:30 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkentrycompletion.c: (gtk_entry_completion_init),
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 983afc53b0..a62bd975cf 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2004-06-07  Federico Mena Quintero  <federico@ximian.com>
+
+	Merge from HEAD:
+	
+	* gtk/gtktreeview.c (gtk_tree_view_button_press): Revert the patch
+	from 2003/Sep/12.  This kept DnD in tree views within modal
+	dialogs from working, which is especially bad for the file
+	chooser.  Fixes #135168.
+
 Sat Jun  5 23:07:30 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkentrycompletion.c: (gtk_entry_completion_init),
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index c720e2209c..3155ec73a3 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -2089,7 +2089,6 @@ gtk_tree_view_button_press (GtkWidget      *widget,
       gint column_handled_click = FALSE;
       gboolean row_double_click = FALSE;
       gboolean rtl;
-      GtkWidget *grab_widget;
 
       /* are we in an arrow? */
       if (tree_view->priv->prelight_node &&
@@ -2295,9 +2294,7 @@ gtk_tree_view_button_press (GtkWidget      *widget,
 
       /* Save press to possibly begin a drag
        */
-      grab_widget = gtk_grab_get_current ();
-      if ((grab_widget == NULL || grab_widget == widget) &&
-          !column_handled_click &&
+      if (!column_handled_click &&
 	  tree_view->priv->pressed_button < 0)
         {
           tree_view->priv->pressed_button = event->button;