diff --git a/ChangeLog b/ChangeLog
index 3aebac0380..e0f8d18716 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-05-25  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktreeview.c (gtk_tree_view_bin_expose): Draw the 
+	background of rows insensitive when the treeview is insensitive.
+	(pointed out by Billy Biggs)
+
 	* demos/gtk-demo/clipboard.c: Demonstrate image copy-and-paste
 	and DND, and clipboard persistency.
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3aebac0380..e0f8d18716 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2005-05-25  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktreeview.c (gtk_tree_view_bin_expose): Draw the 
+	background of rows insensitive when the treeview is insensitive.
+	(pointed out by Billy Biggs)
+
 	* demos/gtk-demo/clipboard.c: Demonstrate image copy-and-paste
 	and DND, and clipboard persistency.
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3aebac0380..e0f8d18716 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2005-05-25  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktreeview.c (gtk_tree_view_bin_expose): Draw the 
+	background of rows insensitive when the treeview is insensitive.
+	(pointed out by Billy Biggs)
+
 	* demos/gtk-demo/clipboard.c: Demonstrate image copy-and-paste
 	and DND, and clipboard persistency.
 
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 4af1996e4c..1cc8df2cef 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -3661,7 +3661,9 @@ gtk_tree_view_bin_expose (GtkWidget      *widget,
 
           g_assert (detail);
 
-	  if (flags & GTK_CELL_RENDERER_SELECTED)
+	  if (widget->state == GTK_STATE_INSENSITIVE)
+	    state = GTK_STATE_INSENSITIVE;	    
+	  else if (flags & GTK_CELL_RENDERER_SELECTED)
 	    state = GTK_STATE_SELECTED;
 	  else
 	    state = GTK_STATE_NORMAL;