diff --git a/ChangeLog b/ChangeLog
index 870e4a9de6..6c86c26e2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-05-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_insert_page_menu): Always
+	initialize child-visible to FALSE, otherwise we may end up
+	with the wrong page visible initially.  (#302283, Patrik Fimml)
+
+	* gtk/gtktreeview.c (gtk_tree_view_draw_arrow): Make expanders
+	appear insensitive in insensitive treeviews. 
+
 2005-05-04  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkevents-x11.c gdk/x11/gdkwindow-x11.h: Fix a bug
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 870e4a9de6..6c86c26e2d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2005-05-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_insert_page_menu): Always
+	initialize child-visible to FALSE, otherwise we may end up
+	with the wrong page visible initially.  (#302283, Patrik Fimml)
+
+	* gtk/gtktreeview.c (gtk_tree_view_draw_arrow): Make expanders
+	appear insensitive in insensitive treeviews. 
+
 2005-05-04  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkevents-x11.c gdk/x11/gdkwindow-x11.h: Fix a bug
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 870e4a9de6..6c86c26e2d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2005-05-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_insert_page_menu): Always
+	initialize child-visible to FALSE, otherwise we may end up
+	with the wrong page visible initially.  (#302283, Patrik Fimml)
+
+	* gtk/gtktreeview.c (gtk_tree_view_draw_arrow): Make expanders
+	appear insensitive in insensitive treeviews. 
+
 2005-05-04  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkevents-x11.c gdk/x11/gdkwindow-x11.h: Fix a bug
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 396c180a80..f4fe7908dc 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -4370,10 +4370,8 @@ gtk_notebook_insert_page_menu (GtkNotebook *notebook,
   if (!notebook->first_tab)
     notebook->first_tab = notebook->children;
 
-  if (!notebook->cur_page)
-    gtk_widget_set_child_visible (child, TRUE);
-  else
-    gtk_widget_set_child_visible (child, FALSE);
+  /* child visible will be turned on by switch_page below */
+  gtk_widget_set_child_visible (child, FALSE);
   
   if (tab_label)
     {
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 2ae7897b1b..3de7d0a2ec 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -3235,12 +3235,15 @@ gtk_tree_view_vertical_autoscroll (GtkTreeView *tree_view)
 
   /* see if we are near the edge. */
   offset = y - (visible_rect.y + 2 * SCROLL_EDGE_SIZE);
+  g_print ("offset1 %d\n", offset);
   if (offset > 0)
     {
       offset = y - (visible_rect.y + visible_rect.height - 2 * SCROLL_EDGE_SIZE);
+      g_print ("offset2 %d\n", offset);
       if (offset < 0)
 	return;
     }
+  g_print ("offset3 %d\n", offset);
 
   value = CLAMP (tree_view->priv->vadjustment->value + offset, 0.0,
 		 tree_view->priv->vadjustment->upper - tree_view->priv->vadjustment->page_size);
@@ -8316,7 +8319,11 @@ gtk_tree_view_draw_arrow (GtkTreeView *tree_view,
   area.width = expander_size + 2;
   area.height = MAX (CELL_HEIGHT (node, vertical_separator), (expander_size - vertical_separator));
 
-  if (node == tree_view->priv->button_pressed_node)
+  if (GTK_WIDGET_STATE (tree_view) == GTK_STATE_INSENSITIVE)
+    {
+      state = GTK_STATE_INSENSITIVE;
+    }
+  else if (node == tree_view->priv->button_pressed_node)
     {
       if (x >= area.x && x <= (area.x + area.width) &&
 	  y >= area.y && y <= (area.y + area.height))