diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 6533cbdb5b..c2762c1f3d 100755
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -165,7 +165,6 @@
     <Compile Include="Widgets\ImageWidget.cs" />
     <Compile Include="Widgets\TextFieldWidget.cs" />
     <Compile Include="Widgets\ChatDisplayWidget.cs" />
-    <Compile Include="Widgets\ListBoxWidget.cs" />
     <Compile Include="Widgets\SliderWidget.cs" />
     <Compile Include="Widgets\TimerWidget.cs" />
     <Compile Include="Widgets\ShpImageWidget.cs" />
@@ -182,6 +181,7 @@
     <Compile Include="Traits\Armor.cs" />
     <Compile Include="Graphics\CursorProvider.cs" />
     <Compile Include="Server\TraitInterfaces.cs" />
+    <Compile Include="Widgets\ScrollPanelWidget.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
diff --git a/OpenRA.Game/Widgets/ButtonWidget.cs b/OpenRA.Game/Widgets/ButtonWidget.cs
index 12edf1f807..ac1554f8c4 100644
--- a/OpenRA.Game/Widgets/ButtonWidget.cs
+++ b/OpenRA.Game/Widgets/ButtonWidget.cs
@@ -122,7 +122,7 @@ namespace OpenRA.Widgets
 			Widget.RootWidget.AddChild(fullscreenMask);
 
 			var origin = w.RenderOrigin;
-			var dropDown = new ListBoxWidget
+			var dropDown = new ScrollPanelWidget
 			{
 				Bounds = new Rectangle(w.RenderOrigin.X, w.RenderOrigin.Y + w.Bounds.Height, w.Bounds.Width, 100),
 				Visible = true,
diff --git a/OpenRA.Game/Widgets/ListBoxWidget.cs b/OpenRA.Game/Widgets/ScrollPanelWidget.cs
similarity index 94%
rename from OpenRA.Game/Widgets/ListBoxWidget.cs
rename to OpenRA.Game/Widgets/ScrollPanelWidget.cs
index dfc8255e91..95c425a831 100644
--- a/OpenRA.Game/Widgets/ListBoxWidget.cs
+++ b/OpenRA.Game/Widgets/ScrollPanelWidget.cs
@@ -13,7 +13,7 @@ using OpenRA.Graphics;
 
 namespace OpenRA.Widgets
 {
-	public class ListBoxWidget : Widget
+	public class ScrollPanelWidget : Widget
 	{
 		public readonly string Background = "dialog3";
 		public readonly int ScrollbarWidth = 24;
@@ -30,8 +30,8 @@ namespace OpenRA.Widgets
 		Rectangle backgroundRect;
 		Rectangle scrollbarRect;
 		
-		public ListBoxWidget() : base() {}
-		protected ListBoxWidget(ListBoxWidget other)
+		public ScrollPanelWidget() : base() {}
+		protected ScrollPanelWidget(ScrollPanelWidget other)
 			: base(other)
 		{
 			Background = other.Background;
@@ -115,6 +115,6 @@ namespace OpenRA.Widgets
 			return (UpPressed || DownPressed);
 		}
 
-		public override Widget Clone() { return new ListBoxWidget(this); }
+		public override Widget Clone() { return new ScrollPanelWidget(this); }
 	}
 }
\ No newline at end of file
diff --git a/OpenRA.Mods.RA/Widgets/Delegates/MapChooserDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/MapChooserDelegate.cs
index 5b6aac5a57..b57031ec91 100644
--- a/OpenRA.Mods.RA/Widgets/Delegates/MapChooserDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/MapChooserDelegate.cs
@@ -31,7 +31,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
 			else
 				Map = Game.modData.AvailableMaps.FirstOrDefault(m => m.Value.Selectable).Value;
 
-			var ml = bg.GetWidget<ListBoxWidget>("MAP_LIST");
+			var ml = bg.GetWidget<ScrollPanelWidget>("MAP_LIST");
 			bg.GetWidget<MapPreviewWidget>("MAPCHOOSER_MAP_PREVIEW").Map = () => Map;
 			bg.GetWidget<LabelWidget>("CURMAP_TITLE").GetText = () => Map.Title;
 			bg.GetWidget<LabelWidget>("CURMAP_SIZE").GetText = () => "{0}x{1}".F(Map.Bounds.Width, Map.Bounds.Height);
diff --git a/OpenRA.Mods.RA/Widgets/Delegates/MusicPlayerDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/MusicPlayerDelegate.cs
index 975bbfc01b..1e38c2586c 100644
--- a/OpenRA.Mods.RA/Widgets/Delegates/MusicPlayerDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/MusicPlayerDelegate.cs
@@ -96,7 +96,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
 			                                                                                    Rules.Music[CurrentSong].Length / 60, Rules.Music[CurrentSong].Length % 60);
 			};
 			
-			var ml = bg.GetWidget<ListBoxWidget>("MUSIC_LIST");
+			var ml = bg.GetWidget<ScrollPanelWidget>("MUSIC_LIST");
 			var itemTemplate = ml.GetWidget<LabelWidget>("MUSIC_TEMPLATE");
 			int offset = itemTemplate.Bounds.Y;
 			
diff --git a/OpenRA.Mods.RA/Widgets/Delegates/ServerBrowserDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/ServerBrowserDelegate.cs
index 1d9fc3200e..5690a8d0c5 100644
--- a/OpenRA.Mods.RA/Widgets/Delegates/ServerBrowserDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/ServerBrowserDelegate.cs
@@ -58,7 +58,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
 			};
 
 
-			var sl = bg.GetWidget<ListBoxWidget>("SERVER_LIST");
+			var sl = bg.GetWidget<ScrollPanelWidget>("SERVER_LIST");
 			ServerTemplate = sl.GetWidget<LabelWidget>("SERVER_TEMPLATE");
 
 			bg.GetWidget("REFRESH_BUTTON").OnMouseUp = mi =>
@@ -137,7 +137,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
             if (bg == null) // We got a MasterServer reply AFTER the browser is gone, just return to prevent crash - Gecko
                 return;
 
-			var sl = bg.GetWidget<ListBoxWidget>("SERVER_LIST");
+			var sl = bg.GetWidget<ScrollPanelWidget>("SERVER_LIST");
 
 			sl.Children.Clear();
 			currentServer = null;
diff --git a/OpenRA.Mods.RA/Widgets/Delegates/VideoPlayerDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/VideoPlayerDelegate.cs
index 36badba508..204ed51829 100644
--- a/OpenRA.Mods.RA/Widgets/Delegates/VideoPlayerDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/VideoPlayerDelegate.cs
@@ -55,7 +55,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
 				return true;
 			};
 			
-			var vl = bg.GetWidget<ListBoxWidget>("VIDEO_LIST");
+			var vl = bg.GetWidget<ScrollPanelWidget>("VIDEO_LIST");
 			var itemTemplate = vl.GetWidget<LabelWidget>("VIDEO_TEMPLATE");
 			int offset = itemTemplate.Bounds.Y;
 			
diff --git a/mods/cnc/chrome/gamelobby.yaml b/mods/cnc/chrome/gamelobby.yaml
index b490fd2cbf..778a158bf6 100644
--- a/mods/cnc/chrome/gamelobby.yaml
+++ b/mods/cnc/chrome/gamelobby.yaml
@@ -408,7 +408,7 @@ Background@MAP_CHOOSER:
 			Height:20
 			Text:Choose Map
 			Bold:True
-		ListBox@MAP_LIST:
+		ScrollPanel@MAP_LIST:
 			Id:MAP_LIST
 			X:20
 			Y:50
diff --git a/mods/cnc/chrome/mainmenu.yaml b/mods/cnc/chrome/mainmenu.yaml
index 3b4a08d68a..190bb0aee8 100644
--- a/mods/cnc/chrome/mainmenu.yaml
+++ b/mods/cnc/chrome/mainmenu.yaml
@@ -241,7 +241,7 @@ Background@MUSIC_MENU:
 			Width:140
 			Height:25
 			Align: Center
-		ListBox@MUSIC_LIST:
+		ScrollPanel@MUSIC_LIST:
 			Id:MUSIC_LIST
 			X:10
 			Y:50
diff --git a/mods/cnc/chrome/serverbrowser.yaml b/mods/cnc/chrome/serverbrowser.yaml
index de18dc908b..17f6229265 100644
--- a/mods/cnc/chrome/serverbrowser.yaml
+++ b/mods/cnc/chrome/serverbrowser.yaml
@@ -109,7 +109,7 @@ Background@JOINSERVER_BG:
 			Text:Join Server
 			Align:Center
 			Bold:True
-		ListBox@SERVER_LIST:
+		ScrollPanel@SERVER_LIST:
 			Id:SERVER_LIST
 			X:20
 			Y:50
diff --git a/mods/cnc/chrome/videoplayer.yaml b/mods/cnc/chrome/videoplayer.yaml
index 7d849328a5..38eeff162a 100644
--- a/mods/cnc/chrome/videoplayer.yaml
+++ b/mods/cnc/chrome/videoplayer.yaml
@@ -20,7 +20,7 @@ Background@VIDEOPLAYER_MENU:
 			Y:50
 			Width:640
 			Height:400
-		ListBox@VIDEO_LIST:
+		ScrollPanel@VIDEO_LIST:
 			Id:VIDEO_LIST
 			X:20
 			Y:460
diff --git a/mods/d2k/chrome/gamelobby.yaml b/mods/d2k/chrome/gamelobby.yaml
index 1aee6d8b29..c63d53c9d7 100644
--- a/mods/d2k/chrome/gamelobby.yaml
+++ b/mods/d2k/chrome/gamelobby.yaml
@@ -406,7 +406,7 @@ Background@MAP_CHOOSER:
 			Height:20
 			Text:Choose Map
 			Bold:True
-		ListBox@MAP_LIST:
+		ScrollPanel@MAP_LIST:
 			Id:MAP_LIST
 			X:20
 			Y:50
diff --git a/mods/d2k/chrome/mainmenu.yaml b/mods/d2k/chrome/mainmenu.yaml
index a031c4fb69..b02efcb949 100644
--- a/mods/d2k/chrome/mainmenu.yaml
+++ b/mods/d2k/chrome/mainmenu.yaml
@@ -209,7 +209,7 @@ Background@MUSIC_MENU:
 			Width:140
 			Height:25
 			Align: Center
-		ListBox@MUSIC_LIST:
+		ScrollPanel@MUSIC_LIST:
 			Id:MUSIC_LIST
 			X:10
 			Y:50
diff --git a/mods/d2k/chrome/serverbrowser.yaml b/mods/d2k/chrome/serverbrowser.yaml
index f64f797a2d..ce68c4b4c6 100644
--- a/mods/d2k/chrome/serverbrowser.yaml
+++ b/mods/d2k/chrome/serverbrowser.yaml
@@ -111,7 +111,7 @@ Background@JOINSERVER_BG:
 			Text:Join Server
 			Align:Center
 			Bold:True
-		ListBox@SERVER_LIST:
+		ScrollPanel@SERVER_LIST:
 			Id:SERVER_LIST
 			X:20
 			Y:50
diff --git a/mods/d2k/chrome/videoplayer.yaml b/mods/d2k/chrome/videoplayer.yaml
index 778bb620d0..08448de714 100644
--- a/mods/d2k/chrome/videoplayer.yaml
+++ b/mods/d2k/chrome/videoplayer.yaml
@@ -21,7 +21,7 @@ Background@VIDEOPLAYER_MENU:
 			Y:50
 			Width:640
 			Height:400
-		ListBox@VIDEO_LIST:
+		ScrollPanel@VIDEO_LIST:
 			Id:VIDEO_LIST
 			X:20
 			Y:460
diff --git a/mods/ra/chrome/gamelobby.yaml b/mods/ra/chrome/gamelobby.yaml
index efea0686bc..6686d31f9c 100644
--- a/mods/ra/chrome/gamelobby.yaml
+++ b/mods/ra/chrome/gamelobby.yaml
@@ -29,7 +29,7 @@ Background@SERVER_LOBBY:
 					Y:4
 					Width:244
 					Height:244
-		ListBox@PLAYERSX:
+		ScrollPanel@PLAYERSX:
 			Id:PLAYERSX
 			X:20
 			Y:75
@@ -439,7 +439,7 @@ Background@MAP_CHOOSER:
 			Height:20
 			Text:Choose Map
 			Bold:True
-		ListBox@MAP_LIST:
+		ScrollPanel@MAP_LIST:
 			Id:MAP_LIST
 			X:20
 			Y:50
diff --git a/mods/ra/chrome/mainmenu.yaml b/mods/ra/chrome/mainmenu.yaml
index 81c42cf00a..aced302135 100644
--- a/mods/ra/chrome/mainmenu.yaml
+++ b/mods/ra/chrome/mainmenu.yaml
@@ -242,7 +242,7 @@ Background@MUSIC_MENU:
 			Width:140
 			Height:25
 			Align: Center
-		ListBox@MUSIC_LIST:
+		ScrollPanel@MUSIC_LIST:
 			Id:MUSIC_LIST
 			X:10
 			Y:50
diff --git a/mods/ra/chrome/serverbrowser.yaml b/mods/ra/chrome/serverbrowser.yaml
index c7d93a04b9..69428ef92a 100644
--- a/mods/ra/chrome/serverbrowser.yaml
+++ b/mods/ra/chrome/serverbrowser.yaml
@@ -109,7 +109,7 @@ Background@JOINSERVER_BG:
 			Text:Join Server
 			Align:Center
 			Bold:True
-		ListBox@SERVER_LIST:
+		ScrollPanel@SERVER_LIST:
 			Id:SERVER_LIST
 			X:20
 			Y:50
diff --git a/mods/ra/chrome/videoplayer.yaml b/mods/ra/chrome/videoplayer.yaml
index 778bb620d0..08448de714 100644
--- a/mods/ra/chrome/videoplayer.yaml
+++ b/mods/ra/chrome/videoplayer.yaml
@@ -21,7 +21,7 @@ Background@VIDEOPLAYER_MENU:
 			Y:50
 			Width:640
 			Height:400
-		ListBox@VIDEO_LIST:
+		ScrollPanel@VIDEO_LIST:
 			Id:VIDEO_LIST
 			X:20
 			Y:460