diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
index 6b463e58fa..956e29d928 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
@@ -150,6 +150,10 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 				{
 					var onSelect = new Action<string>(uid =>
 					{
+						// Don't select the same map again
+						if (uid == Map.Uid)
+							return;
+
 						orderManager.IssueOrder(Order.Command("map " + uid));
 						Game.Settings.Server.Map = uid;
 						Game.Settings.Save();