diff --git a/src/Eto.Mac/Forms/MacWindow.cs b/src/Eto.Mac/Forms/MacWindow.cs
index 9a39c3aee..79f290efc 100644
--- a/src/Eto.Mac/Forms/MacWindow.cs
+++ b/src/Eto.Mac/Forms/MacWindow.cs
@@ -978,9 +978,15 @@ public override bool Visible
 			{
 				if (Visible != value)
 				{
+					if (!value)
+						InternalSetOwner(null);
+						
 					Control.IsVisible = value;
 					if (Widget.Loaded && value)
+					{
+						EnsureOwner();
 						FireOnShown();
+					}
 				}
 			}
 		}
@@ -1319,7 +1325,7 @@ bool InternalSetOwner(Window owner)
 				// since this can get called multiple times
 				Widget.GotFocus -= HandleGotFocusAsChild;
 				
-				if (owner != null)
+				if (owner != null && Visible)
 				{
 					var macWindow = owner.Handler as IMacWindow;
 					if (macWindow != null && macWindow.Control.TabbedWindows?.Contains(Control) != true)
diff --git a/test/Eto.Test/UnitTests/Forms/FormTests.cs b/test/Eto.Test/UnitTests/Forms/FormTests.cs
index 0c9ee7445..1310db7c7 100644
--- a/test/Eto.Test/UnitTests/Forms/FormTests.cs
+++ b/test/Eto.Test/UnitTests/Forms/FormTests.cs
@@ -165,4 +165,52 @@ public void CallingShowAfterShownShouldNotBringItTopMost() => Async(-1, async ()
 
 		await tcs.Task;
 	});
+	
+	class MyModel
+	{
+		public int IntValue { get; set; }
+	}
+	
+	[Test]
+	public void HiddenFormShouldNotShowWhenSettingOwner() => Async(async () => {
+		var child = new Form();
+		var parent = new Form();
+		try
+		{
+			child.Content = "This form should only show briefly";
+			child.Size = new Size(200, 200);
+			child.Location = new Point(100, 100);
+			child.Show();
+			child.Visible = false;
+
+			parent.Content = "This form should show";
+			parent.Size = new Size(200, 200);
+			parent.Location = new Point(400, 400);
+			parent.Show();
+			await Task.Delay(250);
+			child.Owner = parent;
+			await Task.Delay(250);
+			
+			Assert.That(child.Visible, Is.False, "Child should not be visible");
+			Assert.That(parent.Visible, Is.True, "Parent should be visible");
+			
+			// Set visible and test
+			child.Visible = true;
+			await Task.Delay(250);
+			Assert.That(child.Visible, Is.True, "Child should be visible");
+			Assert.That(parent.Visible, Is.True, "Parent should be visible");
+			
+			// Hide again
+			child.Visible = false;
+			await Task.Delay(250);
+
+			Assert.That(child.Visible, Is.False, "Child should not be visible");
+			Assert.That(parent.Visible, Is.True, "Parent should be visible");
+		}
+		finally
+		{
+			child.Close();
+			parent.Close();
+		}
+	});
 }
\ No newline at end of file