diff --git a/src/k_menufunc.c b/src/k_menufunc.c
index e467ba3b4..bc8f99f06 100644
--- a/src/k_menufunc.c
+++ b/src/k_menufunc.c
@@ -564,6 +564,9 @@ void M_StartControlPanel(void)
 			currentMenu->lastOn = 0;
 
 			CV_StealthSetValue(&cv_currprofile, -1); // Make sure to reset that as it is set by PR_ApplyProfile which we kind of hack together to force it.
+
+			// Ambient ocean sounds
+			S_ChangeMusicInternal("_OCEAN", true);
 		}
 		else
 		{
@@ -571,9 +574,9 @@ void M_StartControlPanel(void)
 				restoreMenu = &MainDef;
 			currentMenu = M_SpecificMenuRestore(M_InterruptMenuWithChallenges(restoreMenu));
 			restoreMenu = NULL;
-		}
 
-		M_PlayMenuJam();
+			M_PlayMenuJam();
+		}
 	}
 	else
 	{
diff --git a/src/menus/main-profile-select.c b/src/menus/main-profile-select.c
index 13b840f9a..eb0fdee53 100644
--- a/src/menus/main-profile-select.c
+++ b/src/menus/main-profile-select.c
@@ -16,7 +16,7 @@ menu_t MAIN_ProfilesDef = {
 	32, 80,
 	SKINCOLOR_ULTRAMARINE, 0,
 	0,
-	NULL,
+	"FILE",
 	2, 5,
 	M_DrawProfileSelect,
 	M_OptionsTick,
diff --git a/src/menus/options-profiles-1.c b/src/menus/options-profiles-1.c
index 311788bb1..c43aba4fc 100644
--- a/src/menus/options-profiles-1.c
+++ b/src/menus/options-profiles-1.c
@@ -18,7 +18,7 @@ menu_t OPTIONS_ProfilesDef = {
 	32, 80,
 	SKINCOLOR_ULTRAMARINE, 0,
 	0,
-	NULL,
+	"FILE",
 	2, 5,
 	M_DrawProfileSelect,
 	M_OptionsTick,
diff --git a/src/menus/options-profiles-edit-1.c b/src/menus/options-profiles-edit-1.c
index b1ed78f98..22375da93 100644
--- a/src/menus/options-profiles-edit-1.c
+++ b/src/menus/options-profiles-edit-1.c
@@ -30,7 +30,7 @@ menu_t OPTIONS_EditProfileDef = {
 	32, 80,
 	SKINCOLOR_ULTRAMARINE, 0,
 	0,
-	NULL,
+	"FILE",
 	2, 5,
 	M_DrawEditProfile,
 	M_HandleProfileEdit,
diff --git a/src/menus/options-profiles-edit-controls.c b/src/menus/options-profiles-edit-controls.c
index b97b7f5b7..0140a89d4 100644
--- a/src/menus/options-profiles-edit-controls.c
+++ b/src/menus/options-profiles-edit-controls.c
@@ -109,7 +109,7 @@ menu_t OPTIONS_ProfileControlsDef = {
 	32, 80,
 	SKINCOLOR_ULTRAMARINE, 0,
 	0,
-	NULL,
+	"FILE",
 	3, 5,
 	M_DrawProfileControls,
 	M_HandleProfileControls,
diff --git a/src/menus/play-char-select.c b/src/menus/play-char-select.c
index 35e918a65..c21990ba4 100644
--- a/src/menus/play-char-select.c
+++ b/src/menus/play-char-select.c
@@ -497,6 +497,7 @@ void M_CharacterSelectInit(void)
 void M_CharacterSelect(INT32 choice)
 {
 	(void)choice;
+	PLAY_CharSelectDef.music = currentMenu->music;
 	PLAY_CharSelectDef.prevMenu = currentMenu;
 	M_SetupNextMenu(&PLAY_CharSelectDef, false);
 }