diff --git a/indra/newview/quickprefs.cpp b/indra/newview/quickprefs.cpp
index 819f2c88c7..de27a0bb26 100644
--- a/indra/newview/quickprefs.cpp
+++ b/indra/newview/quickprefs.cpp
@@ -333,6 +333,7 @@ BOOL FloaterQuickPrefs::postBuild()
 	// add global and per account settings to the dropdown
 	gSavedSettings.applyToAll(&func);
 	gSavedPerAccountSettings.applyToAll(&func);
+	mControlNameCombo->sortByName();
 	// </FS:Zi>
 
 	return LLDockableFloater::postBuild();