diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog
index 7d7abdfc0..d492e250d 100644
--- a/capplets/sound/ChangeLog
+++ b/capplets/sound/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-10  Bastien Nocera  <hadess@hadess.net>
+
+	* Makefile.am:
+	* sound-theme.c (get_sound_filename): Simple patch to make
+	the filechooser default to a sensible directory
+
 ==================== 2.24.0.1 ====================
 
 2008-08-28  Claude Paroz  <claude@2xlibre.net>
diff --git a/capplets/sound/Makefile.am b/capplets/sound/Makefile.am
index f9ae6c4ba..e45a66e81 100644
--- a/capplets/sound/Makefile.am
+++ b/capplets/sound/Makefile.am
@@ -25,6 +25,7 @@ INCLUDES = \
 	$(HAL_CFLAGS) \
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
+	-DSOUND_DATA_DIR="\"$(datadir)/sounds\"" \
 	-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""
 
 @INTLTOOL_DESKTOP_RULE@
diff --git a/capplets/sound/sound-theme.c b/capplets/sound/sound-theme.c
index dd221ab0c..3b2319faf 100644
--- a/capplets/sound/sound-theme.c
+++ b/capplets/sound/sound-theme.c
@@ -509,6 +509,8 @@ get_sound_filename (GladeXML *dialog)
 	if (data_dir != NULL)
 		gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (chooser), data_dir, NULL);
 
+	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser), SOUND_DATA_DIR);
+
 	response = gtk_dialog_run (GTK_DIALOG (chooser));
 	filename = NULL;
 	if (response == GTK_RESPONSE_ACCEPT)