diff --git a/OpenRA.Mods.Common/Widgets/Logic/ServerListLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ServerListLogic.cs
index cff82fdb6b..28964315c5 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/ServerListLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/ServerListLogic.cs
@@ -231,12 +231,21 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			if (mapPreview != null)
 				mapPreview.Preview = () => currentMap;
 
-			var mapTitle = widget.GetOrNull<LabelWidget>("SELECTED_MAP");
+			var mapTitle = widget.GetOrNull<LabelWithTooltipWidget>("SELECTED_MAP");
 			if (mapTitle != null)
 			{
 				var font = Game.Renderer.Fonts[mapTitle.Font];
 				var title = new CachedTransform<MapPreview, string>(m =>
-					WidgetUtils.TruncateText(m.Title, mapTitle.Bounds.Width, font));
+				{
+					var truncated = WidgetUtils.TruncateText(m.Title, mapTitle.Bounds.Width, font);
+
+					if (m.Title != truncated)
+						mapTitle.GetTooltipText = () => m.Title;
+					else
+						mapTitle.GetTooltipText = null;
+
+					return truncated;
+				});
 
 				mapTitle.GetText = () =>
 				{
diff --git a/mods/cnc/chrome/lobby-servers.yaml b/mods/cnc/chrome/lobby-servers.yaml
index 2627c80a9c..0a90421b26 100644
--- a/mods/cnc/chrome/lobby-servers.yaml
+++ b/mods/cnc/chrome/lobby-servers.yaml
@@ -168,12 +168,14 @@ Container@LOBBY_SERVERS_BIN:
 							Width: PARENT_RIGHT - 2
 							Height: PARENT_BOTTOM - 2
 							TooltipContainer: TOOLTIP_CONTAINER
-				Label@SELECTED_MAP:
+				LabelWithTooltip@SELECTED_MAP:
 					Y: 172
 					Width: PARENT_RIGHT
 					Height: 25
 					Font: Bold
 					Align: Center
+					TooltipContainer: TOOLTIP_CONTAINER
+					TooltipTemplate: SIMPLE_TOOLTIP
 				Label@SELECTED_IP:
 					Y: 187
 					Width: PARENT_RIGHT
diff --git a/mods/cnc/chrome/multiplayer-browser.yaml b/mods/cnc/chrome/multiplayer-browser.yaml
index 0bfee12a95..d912bfcc60 100644
--- a/mods/cnc/chrome/multiplayer-browser.yaml
+++ b/mods/cnc/chrome/multiplayer-browser.yaml
@@ -168,12 +168,14 @@ Container@MULTIPLAYER_PANEL:
 									Width: PARENT_RIGHT - 2
 									Height: PARENT_BOTTOM - 2
 									TooltipContainer: TOOLTIP_CONTAINER
-						Label@SELECTED_MAP:
+						LabelWithTooltip@SELECTED_MAP:
 							Y: 173
 							Width: PARENT_RIGHT
 							Height: 25
 							Font: Bold
 							Align: Center
+							TooltipContainer: TOOLTIP_CONTAINER
+							TooltipTemplate: SIMPLE_TOOLTIP
 						Label@SELECTED_IP:
 							Y: 188
 							Width: PARENT_RIGHT
diff --git a/mods/common/chrome/lobby-servers.yaml b/mods/common/chrome/lobby-servers.yaml
index 900f082b33..7ef268c798 100644
--- a/mods/common/chrome/lobby-servers.yaml
+++ b/mods/common/chrome/lobby-servers.yaml
@@ -164,12 +164,14 @@ Container@LOBBY_SERVERS_BIN:
 							Width: PARENT_RIGHT - 2
 							Height: PARENT_BOTTOM - 2
 							TooltipContainer: TOOLTIP_CONTAINER
-				Label@SELECTED_MAP:
+				LabelWithTooltip@SELECTED_MAP:
 					Y: 173
 					Width: PARENT_RIGHT
 					Height: 25
 					Font: Bold
 					Align: Center
+					TooltipContainer: TOOLTIP_CONTAINER
+					TooltipTemplate: SIMPLE_TOOLTIP
 				Label@SELECTED_IP:
 					Y: 188
 					Width: PARENT_RIGHT
diff --git a/mods/common/chrome/multiplayer-browser.yaml b/mods/common/chrome/multiplayer-browser.yaml
index 8f9d1f3e5e..54466e64c6 100644
--- a/mods/common/chrome/multiplayer-browser.yaml
+++ b/mods/common/chrome/multiplayer-browser.yaml
@@ -160,12 +160,14 @@ Background@MULTIPLAYER_PANEL:
 							Width: PARENT_RIGHT - 2
 							Height: PARENT_BOTTOM - 2
 							TooltipContainer: TOOLTIP_CONTAINER
-				Label@SELECTED_MAP:
+				LabelWithTooltip@SELECTED_MAP:
 					Y: 173
 					Width: PARENT_RIGHT
 					Height: 25
 					Font: Bold
 					Align: Center
+					TooltipContainer: TOOLTIP_CONTAINER
+					TooltipTemplate: SIMPLE_TOOLTIP
 				Label@SELECTED_IP:
 					Y: 188
 					Width: PARENT_RIGHT