diff --git a/src/k_vote.c b/src/k_vote.c
index 57e014464..ac53bfb57 100644
--- a/src/k_vote.c
+++ b/src/k_vote.c
@@ -1731,6 +1731,10 @@ void Y_StartVote(void)
 	memset(&vote, 0, sizeof(vote));
 	memset(&vote_draw, 0, sizeof(vote_draw));
 
+	// Restarting vote from the menu: stop any long sounds
+	// that were playing (kc37).
+	S_StopSounds();
+
 	vote.tic = vote.endtic = -1;
 
 #ifdef VOTE_TIME_WAIT_FOR_VOTE
diff --git a/src/menus/transient/pause-game.c b/src/menus/transient/pause-game.c
index 48c999736..16f5478f8 100644
--- a/src/menus/transient/pause-game.c
+++ b/src/menus/transient/pause-game.c
@@ -315,7 +315,6 @@ void M_HandlePauseMenuGametype(INT32 choice)
 
 	if (choice == 2)
 	{
-		if (menugametype != gametype)
 		{
 			M_ClearMenus(true);
 			if (server || IsPlayerAdmin(consoleplayer))
@@ -331,10 +330,6 @@ void M_HandlePauseMenuGametype(INT32 choice)
 			}
 			return;
 		}
-
-		S_StartSound(NULL, sfx_s3k7b);
-
-		return;
 	}
 
 	if (choice == -1)