diff --git a/ChangeLog b/ChangeLog
index 650b80720a..802507df5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jul 19 23:51:50 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktreeview.c (gtk_tree_view_enter_notify): Don't
+	use uninitialized node pointer.  (#147911, Peter Zelezny)
+
+	* gtk/gtktreeview.c (gtk_tree_view_enter_notify): 
+
 Tue Jul 20 04:34:56 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* configure.in: Bump version number
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 650b80720a..802507df5e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Mon Jul 19 23:51:50 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktreeview.c (gtk_tree_view_enter_notify): Don't
+	use uninitialized node pointer.  (#147911, Peter Zelezny)
+
+	* gtk/gtktreeview.c (gtk_tree_view_enter_notify): 
+
 Tue Jul 20 04:34:56 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* configure.in: Bump version number
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 650b80720a..802507df5e 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Mon Jul 19 23:51:50 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktreeview.c (gtk_tree_view_enter_notify): Don't
+	use uninitialized node pointer.  (#147911, Peter Zelezny)
+
+	* gtk/gtktreeview.c (gtk_tree_view_enter_notify): 
+
 Tue Jul 20 04:34:56 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* configure.in: Bump version number
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 650b80720a..802507df5e 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Mon Jul 19 23:51:50 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtktreeview.c (gtk_tree_view_enter_notify): Don't
+	use uninitialized node pointer.  (#147911, Peter Zelezny)
+
+	* gtk/gtktreeview.c (gtk_tree_view_enter_notify): 
+
 Tue Jul 20 04:34:56 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* configure.in: Bump version number
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 89ba3a603e..0c3c9edd87 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -4253,17 +4253,15 @@ gtk_tree_view_enter_notify (GtkWidget        *widget,
   if (tree_view->priv->tree == NULL)
     return FALSE;
 
-  if ((tree_view->priv->button_pressed_node != NULL) &&
-      (tree_view->priv->button_pressed_node != node))
-    return TRUE;
-
   /* find the node internally */
   new_y = TREE_WINDOW_Y_TO_RBTREE_Y(tree_view, event->y);
   if (new_y < 0)
     new_y = 0;
   _gtk_rbtree_find_offset (tree_view->priv->tree, new_y, &tree, &node);
 
-  prelight_or_select (tree_view, tree, node, event->x, event->y);
+  if ((tree_view->priv->button_pressed_node == NULL) ||
+      (tree_view->priv->button_pressed_node == node))
+    prelight_or_select (tree_view, tree, node, event->x, event->y);
 
   return TRUE;
 }