diff --git a/src/gnome-utils/dialog-file-access.c b/src/gnome-utils/dialog-file-access.c
index 0bffa1edb8..e7468d081c 100644
--- a/src/gnome-utils/dialog-file-access.c
+++ b/src/gnome-utils/dialog-file-access.c
@@ -316,10 +316,9 @@ gnc_ui_file_access( int type )
 		gtk_combo_box_append_text( faw->cb_uri_type, "xml" );
 		++access_method_index;
 		
-		// If we haven't set a default yet, set it now
-		if( active_access_method_index == -1 ) {
-			active_access_method_index = access_method_index;
-		}
+		// Set XML as default if it is offered (which mean we are in
+		// the "Save As" dialog)
+		active_access_method_index = access_method_index;
 	}
 	g_assert( active_access_method_index >= 0 );
 	gtk_combo_box_set_active( faw->cb_uri_type, active_access_method_index );