diff --git a/OpenRA.Mods.Common/Traits/World/EditorActorPreview.cs b/OpenRA.Mods.Common/Traits/World/EditorActorPreview.cs
index 1a616a8159..9255bb1e27 100644
--- a/OpenRA.Mods.Common/Traits/World/EditorActorPreview.cs
+++ b/OpenRA.Mods.Common/Traits/World/EditorActorPreview.cs
@@ -70,7 +70,7 @@ namespace OpenRA.Mods.Common.Traits
 			}
 
 			var tooltip = Info.TraitInfoOrDefault<TooltipInfo>();
-			Tooltip = tooltip == null ? ID + ": " + Info.Name : ID + ": " + tooltip.Name + " (" + Info.Name + ")";
+			Tooltip = tooltip == null ? ID + ": " + Info.Name : ID + ": " + tooltip.Name + " (" + Info.Name + ")" + "\n" + owner.Name + " (" + owner.Faction + ")";
 
 			GeneratePreviews();
 
diff --git a/OpenRA.Mods.Common/Widgets/Logic/SimpleTooltipLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/SimpleTooltipLogic.cs
index ededbfa962..de350cb159 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/SimpleTooltipLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/SimpleTooltipLogic.cs
@@ -26,11 +26,13 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			tooltipContainer.BeforeRender = () =>
 			{
 				labelText = getText();
-				var textWidth = font.Measure(labelText).X;
-				if (textWidth != cachedWidth)
+				var textDim = font.Measure(labelText);
+				if (textDim.X != cachedWidth)
 				{
-					label.Bounds.Width = textWidth;
-					widget.Bounds.Width = 2 * label.Bounds.X + textWidth;
+					label.Bounds.Width = textDim.X;
+					widget.Bounds.Width = 2 * label.Bounds.X + textDim.X;
+					label.Bounds.Height = textDim.Y;
+					widget.Bounds.Height = 4 * label.Bounds.Y + textDim.Y;
 				}
 			};