--- gtk+2.0-2.24.10/gtk/gtkfilechooserdefault.c 2011-11-08 10:20:20.000000000 -0700
+++ Downloads/gtk/gtk+2.0-2.24.10/gtk/gtkfilechooserdefault.c   2012-07-10 17:20:38.000000000 -0700
@@ -5971,10 +5971,18 @@ gtk_file_chooser_default_map (GtkWidget
 
   if (impl->operation_mode == OPERATION_MODE_BROWSE)
     {
+      GFile *folder;
+
       switch (impl->reload_state)
         {
         case RELOAD_EMPTY:
-         recent_shortcut_handler (impl);
+          /* The user didn't explicitly give us a folder to display, so we'll
+           * use the saved one from the last invocation of the file chooser
+           */
+          folder = get_file_for_last_folder_opened (impl);
+          gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (impl), folder, NULL);
+          g_object_unref (folder);
+         /* recent_shortcut_handler (impl); */
           break;
         
         case RELOAD_HAS_FOLDER:
@@ -6005,8 +6013,8 @@ gtk_file_chooser_default_unmap (GtkWidge
 
   settings_save (impl);
 
-  cancel_all_operations (impl);
-  impl->reload_state = RELOAD_EMPTY;
+  /* cancel_all_operations (impl);
+  impl->reload_state = RELOAD_EMPTY; */
 
   GTK_WIDGET_CLASS (_gtk_file_chooser_default_parent_class)->unmap (widget);
 }