diff --git a/OpenRA.Game/GameRules/Settings.cs b/OpenRA.Game/GameRules/Settings.cs
index 540d972e54..641865a819 100755
--- a/OpenRA.Game/GameRules/Settings.cs
+++ b/OpenRA.Game/GameRules/Settings.cs
@@ -73,6 +73,7 @@ namespace OpenRA.GameRules
 		public float VideoVolume = 0.5f;
 		public bool Shuffle = false;
 		public bool Repeat = false;
+		public bool ShellmapMusic = true;
 	}
 
 	public class PlayerSettings
@@ -87,7 +88,6 @@ namespace OpenRA.GameRules
 	public class GameSettings
 	{
 		public string[] Mods = { "ra" };
-		public bool ShellmapMusic = true;
 
 		public bool TeamChatToggle = false;
 
diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs
index 95e1332278..47b3aa0ba3 100644
--- a/OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs
@@ -103,8 +103,8 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 			musicSlider.Value = soundSettings.MusicVolume;
 
 			var shellmapMusicCheckbox = generalPane.GetWidget<CheckboxWidget>("SHELLMAP_MUSIC");
-			shellmapMusicCheckbox.IsChecked = () => gameSettings.ShellmapMusic;
-			shellmapMusicCheckbox.OnClick = () => gameSettings.ShellmapMusic ^= true;
+			shellmapMusicCheckbox.IsChecked = () => soundSettings.ShellmapMusic;
+			shellmapMusicCheckbox.OnClick = () => soundSettings.ShellmapMusic ^= true;
 
 			// Input pane
 			var inputPane = panel.GetWidget("INPUT_CONTROLS");
diff --git a/OpenRA.Mods.RA/World/PlayMusicOnMapLoad.cs b/OpenRA.Mods.RA/World/PlayMusicOnMapLoad.cs
index 314d6cec9e..3367033878 100644
--- a/OpenRA.Mods.RA/World/PlayMusicOnMapLoad.cs
+++ b/OpenRA.Mods.RA/World/PlayMusicOnMapLoad.cs
@@ -36,7 +36,7 @@ namespace OpenRA.Mods.RA
 		{
 			var onComplete = Info.Loop ? (Action)PlayMusic : () => {};
 
-			if (Game.Settings.Game.ShellmapMusic &&
+			if (Game.Settings.Sound.ShellmapMusic &&
 			    Rules.Music.ContainsKey(Info.Music))
 				Sound.PlayMusicThen(Rules.Music[Info.Music], onComplete);
 		}