diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs
index 6fccd3e030..df9916c713 100644
--- a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs
@@ -65,7 +65,10 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 			menu.Get<ButtonWidget>("MUSIC_BUTTON").OnClick = () =>
 			{
 				hideButtons = true;
-				MusicPlayerLogic.OpenWindow(world, () => hideButtons = false);
+				Ui.OpenWindow("MUSIC_PANEL", new WidgetArgs()
+				{
+					{ "onExit", () => hideButtons = false },
+				});
 			};
 
 			menu.Get<ButtonWidget>("SETTINGS_BUTTON").OnClick = () =>
diff --git a/OpenRA.Mods.RA/Widgets/Logic/IngameMenuLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/IngameMenuLogic.cs
index dba75a4034..671b8fdd33 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/IngameMenuLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/IngameMenuLogic.cs
@@ -63,7 +63,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			widget.Get<ButtonWidget>("MUSIC").OnClick = () =>
 			{
 				widget.Visible = false;
-				MusicPlayerLogic.OpenWindow(world, () => { widget.Visible = true; });
+				Ui.OpenWindow("MUSIC_PANEL", new WidgetArgs { { "onExit", () => { widget.Visible = true; } } });
 			};
 			widget.Get<ButtonWidget>("RESUME").OnClick = () => onExit();
 
diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
index 6992ef4527..fda25e1f93 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
@@ -483,7 +483,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 
 			var musicButton = lobby.GetOrNull<ButtonWidget>("MUSIC_BUTTON");
 			if (musicButton != null)
-				musicButton.OnClick = () => MusicPlayerLogic.OpenWindow(world);
+				musicButton.OnClick = () => Ui.OpenWindow("MUSIC_PANEL", new WidgetArgs { { "onExit", DoNothing } });
 
 			var settingsButton = lobby.GetOrNull<ButtonWidget>("SETTINGS_BUTTON");
 			if (settingsButton != null)
diff --git a/OpenRA.Mods.RA/Widgets/Logic/MainMenuLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/MainMenuLogic.cs
index 2797c0b8c6..60106a3b9f 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/MainMenuLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/MainMenuLogic.cs
@@ -110,7 +110,10 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			extrasMenu.Get<ButtonWidget>("MUSIC_BUTTON").OnClick = () =>
 			{
 				menuType = MenuType.None;
-				MusicPlayerLogic.OpenWindow(world, () => menuType = MenuType.Extras);
+				Ui.OpenWindow("MUSIC_PANEL", new WidgetArgs
+				{
+					{ "onExit", () => menuType = MenuType.Extras },
+				});
 			};
 
 			var assetBrowserButton = extrasMenu.GetOrNull<ButtonWidget>("ASSETBROWSER_BUTTON");
diff --git a/OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs
index 7443478e90..ea92dff627 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs
@@ -28,17 +28,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 
 		ScrollItemWidget itemTemplate;
 
-		public static Widget OpenWindow(World world, Action onExit = null)
-		{
-			return Ui.OpenWindow(
-				"MUSIC_PANEL",
-				new WidgetArgs
-				{
-					{ "onExit", onExit != null ? onExit : (() => {}) }
-				}
-			);
-		}
-
 		[ObjectCreator.UseCtor]
 		public MusicPlayerLogic(Widget widget, World world, Action onExit)
 		{