diff --git a/ChangeLog b/ChangeLog
index cbb6e27fed..b84ea61603 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-22  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_leave_notify): Avoid spurious
+	drags.  (#164884)
+
 2005-01-23  Tor Lillqvist  <tml@novell.com>
 
 	* gdk/win32/gdkkeys-win32.c (update_keymap): Handle Greek tonos
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cbb6e27fed..b84ea61603 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-01-22  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_leave_notify): Avoid spurious
+	drags.  (#164884)
+
 2005-01-23  Tor Lillqvist  <tml@novell.com>
 
 	* gdk/win32/gdkkeys-win32.c (update_keymap): Handle Greek tonos
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index cbb6e27fed..b84ea61603 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-01-22  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_leave_notify): Avoid spurious
+	drags.  (#164884)
+
 2005-01-23  Tor Lillqvist  <tml@novell.com>
 
 	* gdk/win32/gdkkeys-win32.c (update_keymap): Handle Greek tonos
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 2f6c5d6276..3e4d964890 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -4455,11 +4455,11 @@ gtk_tree_view_leave_notify (GtkWidget        *widget,
 {
   GtkTreeView *tree_view;
 
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
+  tree_view = GTK_TREE_VIEW (widget);
+  tree_view->priv->pressed_button = -1;
 
   if (event->mode == GDK_CROSSING_GRAB)
     return TRUE;
-  tree_view = GTK_TREE_VIEW (widget);
 
   if (tree_view->priv->prelight_node)
     _gtk_tree_view_queue_draw_node (tree_view,