diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index f73c74731..28ecab819 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,5 @@
 Changes towards version 0.6:
+- Menu sounds in Setup track rest of game (#922), from Nic - Michael
 - Shifted the Mouse Error to a Popup Window, moved the message to
   starcon.txt for translators - Michael
 - Generic DoPopupWindow() command for status messages - Michael
diff --git a/sc2/src/sc2code/melee.c b/sc2/src/sc2code/melee.c
index 3487bfdf3..bc40f6b08 100644
--- a/sc2/src/sc2code/melee.c
+++ b/sc2/src/sc2code/melee.c
@@ -2220,7 +2220,7 @@ DoConnectingDialog (PMELEE_STATE pMS)
 	if (GLOBAL (CurrentActivity) & CHECK_ABORT)
 		return (FALSE);
 
-	SetMenuSounds (0, 0);
+	SetMenuSounds (MENU_SOUND_NONE, MENU_SOUND_NONE);
 	if (!pMS->Initialized)
 	{
 		RECT r;
diff --git a/sc2/src/sc2code/setupmenu.c b/sc2/src/sc2code/setupmenu.c
index e688a6ae7..923c954b8 100644
--- a/sc2/src/sc2code/setupmenu.c
+++ b/sc2/src/sc2code/setupmenu.c
@@ -547,7 +547,7 @@ OnTextEntryEvent (WIDGET_TEXTENTRY *widget)
 	tes.ChangeCallback = OnTextEntryChange;
 	tes.FrameCallback = OnTextEntryFrame;
 
-	SetMenuSounds (0, MENU_SOUND_SELECT);
+	SetMenuSounds (MENU_SOUND_NONE, MENU_SOUND_SELECT);
 	if (!DoTextEntry (&tes))
 	{	// editing failed (canceled) -- revert the changes
 		utf8StringCopy (widget->value, widget->maxlen, revert_buf);
@@ -1013,7 +1013,7 @@ SetupMenu (void)
 
 	s.InputFunc = DoSetupMenu;
 	s.initialized = FALSE;
-	SetMenuSounds (0, MENU_SOUND_SELECT);
+	SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT);
 	SetupTab = CaptureStringTable (LoadStringTable (SETUP_MENU_STRTAB));
 	if (SetupTab) 
 	{