diff --git a/CHANGES.WII b/CHANGES.WII
index 0bfe05d..ef433f2 100644
--- a/CHANGES.WII
+++ b/CHANGES.WII
@@ -1,5 +1,8 @@
 version 2:
+        * Only save prefs on exit
+        * Pause sound in the menu
         * Handle very long filenames better (thanks Corey89 for pointing this out)
+        * Corrected file sorting
         * Better Makefile
         * More keycodes added (C=)
 
diff --git a/Src/C64_SDL.i b/Src/C64_SDL.i
index 77e78de..1d98052 100644
--- a/Src/C64_SDL.i
+++ b/Src/C64_SDL.i
@@ -164,7 +164,7 @@ static const char **get_file_list(const char *base_dir)
 		}
 	}
 	closedir(d);
-        qsort(file_list, cur, sizeof(const char *), cmpstringp);
+        qsort(&file_list[1], cur-1, sizeof(const char *), cmpstringp);
 
         return file_list;
 }
@@ -437,6 +437,7 @@ void C64::VBlank(bool draw_frame)
 
 		Prefs *np = Frodo::reload_prefs();
 
+		TheSID->PauseSound();
 		submenus[0] = np->JoystickSwap == true ? 1 : 0;
 		opt = menu_select(real_screen, &this->main_menu, submenus);
 
@@ -464,6 +465,7 @@ void C64::VBlank(bool draw_frame)
 			break;
 		case 9: /* Quit */
 			quit_thyself = true;				
+			ThePrefs.Save(PREFS_PATH);
 			break;
 		case -1:
 		default: