Index: shell/rb-shell.c
===================================================================
--- shell/rb-shell.c	(revision 6128)
+++ shell/rb-shell.c	(working copy)
@@ -2452,9 +2452,12 @@
 				      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
 				      FALSE);
 	gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
-	if (dir)
+	if (dir && dir[0] != 0)
 		gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog),
 							 dir);
+	else
+		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog),
+						     rb_music_dir ());
 
 	g_signal_connect_object (G_OBJECT (dialog),
 				 "response",
@@ -2474,9 +2477,12 @@
 				      GTK_FILE_CHOOSER_ACTION_OPEN,
 				      FALSE);
 	gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
-	if (dir)
+	if (dir && dir[0] != 0)
 		gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog),
 							 dir);
+	else
+		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog),
+						     rb_music_dir ());
 
 	g_signal_connect_object (G_OBJECT (dialog),
 				 "response",
