diff --git a/OpenRA.Mods.RA/Widgets/Logic/ServerBrowserLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ServerBrowserLogic.cs
index 7e11bf2f77..6e093b4ced 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/ServerBrowserLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/ServerBrowserLogic.cs
@@ -18,8 +18,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 {
 	public class ServerBrowserLogic
 	{
-		static List<Widget> GameButtons = new List<Widget>();
-
 		GameServer currentServer = null;
 		ScrollItemWidget ServerTemplate;
 
@@ -31,9 +29,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			bg.GetWidget("JOINSERVER_PROGRESS_TITLE").Visible = true;
 			bg.GetWidget<LabelWidget>("JOINSERVER_PROGRESS_TITLE").Text = "Fetching game list...";
 
-			bg.Children.RemoveAll(a => GameButtons.Contains(a));
-			GameButtons.Clear();
-
 			ServerList.Query(RefreshServerList);
 
 			bg.GetWidget("SERVER_INFO").IsVisible = () => currentServer != null;
@@ -62,12 +57,10 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			{
 				bg.GetWidget("JOINSERVER_PROGRESS_TITLE").Visible = true;
 				bg.GetWidget<LabelWidget>("JOINSERVER_PROGRESS_TITLE").Text = "Fetching game list...";
-
-				bg.Children.RemoveAll(a => GameButtons.Contains(a));
-				GameButtons.Clear();
+				sl.RemoveChildren();
+				currentServer = null;
 
 				ServerList.Query(RefreshServerList);
-
 				return true;
 			};