Index: gtk/gtkfilechooserdefault.c
===================================================================
--- gtk/gtkfilechooserdefault.c	(revision 17131)
+++ gtk/gtkfilechooserdefault.c	(working copy)
@@ -418,6 +418,8 @@ static void location_button_toggled_cb (
 					GtkFileChooserDefault *impl);
 static void location_switch_to_path_bar (GtkFileChooserDefault *impl);
 
+static void settings_load		(GtkFileChooserDefault *impl);
+
 
 
 
@@ -4356,6 +4358,7 @@ save_widgets_create (GtkFileChooserDefau
   gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
 
   impl->save_expander = gtk_expander_new_with_mnemonic (_("_Browse for other folders"));
+  gtk_expander_set_expanded (GTK_EXPANDER (impl->save_expander), impl->expand_folders);
   gtk_container_add (GTK_CONTAINER (alignment), impl->save_expander);
   g_signal_connect (impl->save_expander, "notify::expanded",
 		    G_CALLBACK (expander_changed_cb),
@@ -4688,7 +4691,9 @@ gtk_file_chooser_default_constructor (GT
   gtk_box_pack_start (GTK_BOX (impl), impl->extra_align, FALSE, FALSE, 0);
 
   gtk_widget_pop_composite_child ();
+
   update_appearance (impl);
+  settings_load (impl);
 
   profile_end ("end", NULL);
 
@@ -5504,8 +5509,6 @@ gtk_file_chooser_default_map (GtkWidget 
 
   bookmarks_changed_cb (impl->file_system, impl);
 
-  settings_load (impl);
-
   profile_end ("end", NULL);
 }
 
