--- gedit-2.15.1/gedit/gedit-commands-file.c.bgo-341055-workaround	2006-05-13 13:46:43.000000000 -0400
+++ gedit-2.15.1/gedit/gedit-commands-file.c	2006-05-13 13:48:12.000000000 -0400
@@ -336,12 +336,6 @@
 	if (default_path == NULL)
 		default_path = g_strdup (_gedit_window_get_default_path (window));
 
-	if (default_path != NULL)
-		gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (open_dialog),
-							 default_path);
-
-	g_free (default_path);
-
         selector_width = gedit_prefs_manager_get_opensave_dialog_width ();
         selector_height = gedit_prefs_manager_get_opensave_dialog_height ();
         gtk_window_resize (GTK_WINDOW (open_dialog), selector_width, selector_height);
@@ -351,6 +345,11 @@
 			  window);
 
 	gtk_widget_show (open_dialog);
+
+	if (default_path != NULL)
+		gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (open_dialog),
+							 default_path);
+	g_free (default_path);
 }
 
 static void
@@ -767,24 +766,6 @@
 
 	g_free (uri);
 
-	if (!uri_set)
-	{
-		const gchar *default_path;
-		gchar *docname;
-
-		default_path = _gedit_window_get_default_path (window);
-		docname = gedit_document_get_short_name_for_display (doc);
-
-		if (default_path != NULL)
-			gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (save_dialog),
-								 default_path);
-
-		gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (save_dialog),
-						   docname);
-
-		g_free (docname);
-	}
-
 	/* Set suggested encoding */
 	encoding = gedit_document_get_encoding (doc);
 	g_return_if_fail (encoding != NULL);
@@ -807,6 +788,24 @@
         gtk_window_resize (GTK_WINDOW (save_dialog), selector_width, selector_height);
 
 	gtk_widget_show (save_dialog);
+
+	if (!uri_set)
+	{
+		const gchar *default_path;
+		gchar *docname;
+
+		default_path = _gedit_window_get_default_path (window);
+		docname = gedit_document_get_short_name_for_display (doc);
+
+		if (default_path != NULL)
+			gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (save_dialog),
+								 default_path);
+
+		gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (save_dialog),
+						   docname);
+
+		g_free (docname);
+	}
 }
 
 static void