diff --git a/src/Eto.Mac/Forms/Controls/MacLabel.cs b/src/Eto.Mac/Forms/Controls/MacLabel.cs
index 2d1b43f5a5..99600d66ab 100644
--- a/src/Eto.Mac/Forms/Controls/MacLabel.cs
+++ b/src/Eto.Mac/Forms/Controls/MacLabel.cs
@@ -148,6 +148,10 @@ public abstract class MacLabel<TControl, TWidget, TCallback> : MacView<TControl,
 
 		protected override SizeF GetNaturalSize(SizeF availableSize)
 		{
+			// set attributes if it hasn't been loaded yet, so we get the correct size.
+			if (!Widget.Loaded)
+				SetAttributes(true);
+
 			if (float.IsPositiveInfinity(availableSize.Width))
 			{
 				if (naturalSizeInfinity != null)
@@ -393,6 +397,7 @@ public override void OnLoad(EventArgs e)
 		{
 			base.OnLoad(e);
 			SetAttributes(true);
+			InvalidateMeasure();
 		}
 
 		public override void AttachEvent(string id)
diff --git a/test/Eto.Test/UnitTests/Forms/Layout/PixelLayoutTests.cs b/test/Eto.Test/UnitTests/Forms/Layout/PixelLayoutTests.cs
index 174c04f2b2..6f3f1a8900 100644
--- a/test/Eto.Test/UnitTests/Forms/Layout/PixelLayoutTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/Layout/PixelLayoutTests.cs
@@ -33,5 +33,20 @@ public void SettingChildSizeShouldNotChangePosition()
 				return layout;
 			});
 		}
+
+		[Test, ManualTest]
+		public void LabelsShouldGetCorrectSize()
+		{
+			ManualForm("Labels should end with a period", form => {
+				// note: this actually failed only when the form was the initial window, as it calculated its size before it was even shown.
+				form.ClientSize = new Size(200, 200);
+
+				var layout = new PixelLayout();
+				layout.Add(new Label { Text = "Hello world.", BackgroundColor = Colors.Yellow, TextColor = Colors.Black }, 50, 50);
+				layout.Add(new Label { Text = "Bonjour monde.", BackgroundColor = Colors.LightGreen, TextColor = Colors.Black }, 20, 20);
+				form.Content = layout;
+				return layout;
+			});
+		}
 	}
 }