diff --git a/osu.Desktop.VisualTests/Tests/TestCaseMultiRoomPanel.cs b/osu.Desktop.VisualTests/Tests/TestCaseMultiRoomPanel.cs
index 29cc4481a9..a6dbcda8f9 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseMultiRoomPanel.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseMultiRoomPanel.cs
@@ -3,7 +3,6 @@
 
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Framework.Screens.Testing;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Multiplayer;
@@ -13,14 +12,15 @@ using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
 using osu.Game.Graphics.Sprites;
+using osu.Framework.Testing;
 
 namespace osu.Desktop.VisualTests.Tests
 {
     class TestCaseMultiRoomPanel : TestCase
     {
         private MultiRoomPanel test;
-        private FlowContainer panelContainer;
-        public override string Name => @"MultiRoomPanel";
+        private FillFlowContainer panelContainer;
+
         public override string Description => @"Select your favourite room";
 
         private void action(int action)
@@ -37,14 +37,14 @@ namespace osu.Desktop.VisualTests.Tests
         {
             base.Reset();
 
-            AddButton(@"ChangeState", () => action(0));
+            AddStep(@"ChangeState", () => action(0));
 
-            Add(panelContainer = new FlowContainer //Positionning container
+            Add(panelContainer = new FillFlowContainer //Positionning container
             {
                 RelativeSizeAxes = Axes.Both,
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                Direction = FlowDirections.Vertical,
+                Direction = FillDirection.Vertical,
                 Size = new Vector2(0.4f, 0.5f),
                 Children = new Drawable[]
                 {
diff --git a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
index 135e4596c7..a2228ca9aa 100644
--- a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
+++ b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
@@ -217,6 +217,7 @@
     <Compile Include="Tests\TestCaseLeaderboard.cs" />
     <Compile Include="Beatmaps\TestWorkingBeatmap.cs" />
     <Compile Include="Tests\TestCaseBeatmapDetailArea.cs" />
+    <Compile Include="Tests\TestCaseMultiRoomPanel.cs" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup />
diff --git a/osu.Game/Screens/Multiplayer/MultiRoomPanel.cs b/osu.Game/Screens/Multiplayer/MultiRoomPanel.cs
index 174ec19f75..cbc4cc1182 100644
--- a/osu.Game/Screens/Multiplayer/MultiRoomPanel.cs
+++ b/osu.Game/Screens/Multiplayer/MultiRoomPanel.cs
@@ -4,12 +4,12 @@
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Sprites;
 
@@ -132,12 +132,12 @@ namespace osu.Game.Screens.Multiplayer
                     RelativeSizeAxes = Axes.Both,
                 }
                 ,
-                new FlowContainer
+                new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
-                    Direction = FlowDirections.Vertical,
+                    Direction = FillDirection.Vertical,
                     Size = new Vector2(0.75f,1),
 
                     Children = new Drawable[]
@@ -148,11 +148,11 @@ namespace osu.Game.Screens.Multiplayer
                             TextSize = 18,
                             Margin = new MarginPadding { Top = CONTENT_PADDING },
                         },
-                        new FlowContainer
+                        new FillFlowContainer
                         {
                             RelativeSizeAxes = Axes.X,
                             Height = 20,
-                            Direction = FlowDirections.Horizontal,
+                            Direction = FillDirection.Horizontal,
                             Spacing = new Vector2(5,0),
                             Children = new Drawable[]
                             {
@@ -225,10 +225,10 @@ namespace osu.Game.Screens.Multiplayer
                             Colour = statusColour,
                             Margin = new MarginPadding { Top = 10 }
                         },
-                        new FlowContainer
+                        new FillFlowContainer
                         {
                             RelativeSizeAxes = Axes.X,
-                            Direction = FlowDirections.Horizontal,
+                            Direction = FillDirection.Horizontal,
                             Children = new Drawable[]
                             {
                                 new OsuSpriteText
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 2a1195135a..6cc05bf327 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -427,6 +427,7 @@
     <Compile Include="Overlays\Music\PlaylistOverlay.cs" />
     <Compile Include="Rulesets\Replays\IAutoGenerator.cs" />
     <Compile Include="Rulesets\Replays\AutoGenerator.cs" />
+    <Compile Include="Screens\Multiplayer\MultiRoomPanel.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">