diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 8caba5d9c8..768dc6512c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -146,7 +146,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 });
             });
 
-            AddToggleStep("toggle ready state", v => Client.ChangeUserState(0, v ? MultiplayerUserState.Ready : MultiplayerUserState.Idle));
+            for (var i = MultiplayerUserState.Idle; i < MultiplayerUserState.Results; i++)
+            {
+                var state = i;
+                AddStep($"set state: {state}", () => Client.ChangeUserState(0, state));
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index a782da4c39..f6a60c8f57 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -129,32 +129,25 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                                     }
                                 }
                             },
-                            new FillFlowContainer
+                            new Container
                             {
                                 Anchor = Anchor.CentreRight,
                                 Origin = Anchor.CentreRight,
                                 AutoSizeAxes = Axes.Both,
-                                Direction = FillDirection.Horizontal,
-                                Margin = new MarginPadding { Right = 10 },
-                                Spacing = new Vector2(10),
-                                Children = new Drawable[]
+                                Margin = new MarginPadding { Right = 70 },
+                                Child = userModsDisplay = new ModDisplay
                                 {
-                                    userModsDisplay = new ModDisplay
-                                    {
-                                        Anchor = Anchor.Centre,
-                                        Origin = Anchor.Centre,
-                                        Scale = new Vector2(0.5f),
-                                        ExpansionMode = ExpansionMode.AlwaysContracted,
-                                        DisplayUnrankedText = false,
-                                        ExpandOnAppear = false
-                                    },
-                                    userStateDisplay = new StateDisplay
-                                    {
-                                        Anchor = Anchor.Centre,
-                                        Origin = Anchor.Centre,
-                                        AlwaysPresent = true
-                                    }
+                                    Scale = new Vector2(0.5f),
+                                    ExpansionMode = ExpansionMode.AlwaysContracted,
+                                    DisplayUnrankedText = false,
+                                    ExpandOnAppear = false
                                 }
+                            },
+                            userStateDisplay = new StateDisplay
+                            {
+                                Anchor = Anchor.CentreRight,
+                                Origin = Anchor.CentreRight,
+                                Margin = new MarginPadding { Right = 10 },
                             }
                         }
                     }