diff --git a/MapControl/Avalonia/PushpinBorder.Avalonia.cs b/MapControl/Avalonia/PushpinBorder.Avalonia.cs
index 37e27c36..08c48269 100644
--- a/MapControl/Avalonia/PushpinBorder.Avalonia.cs
+++ b/MapControl/Avalonia/PushpinBorder.Avalonia.cs
@@ -76,16 +76,13 @@ namespace MapControl
 
         protected override Size ArrangeOverride(Size size)
         {
-            if (Child != null)
-            {
-                Child.Arrange(new Rect(
-                    BorderWidth + Padding.Left,
-                    BorderWidth + Padding.Top,
-                    size.Width - BorderWidth - Padding.Right,
-                    size.Height - BorderWidth - Padding.Bottom));
-            }
+            Child?.Arrange(new Rect(
+                BorderWidth + Padding.Left,
+                BorderWidth + Padding.Top,
+                Child.DesiredSize.Width,
+                Child.DesiredSize.Height));
 
-            return size;
+            return DesiredSize;
         }
 
         public override void Render(DrawingContext drawingContext)
diff --git a/MapControl/WPF/PushpinBorder.WPF.cs b/MapControl/WPF/PushpinBorder.WPF.cs
index 031bd500..ad87ab31 100644
--- a/MapControl/WPF/PushpinBorder.WPF.cs
+++ b/MapControl/WPF/PushpinBorder.WPF.cs
@@ -86,16 +86,13 @@ namespace MapControl
 
         protected override Size ArrangeOverride(Size size)
         {
-            if (Child != null)
-            {
-                Child.Arrange(new Rect(
-                    BorderWidth + Padding.Left,
-                    BorderWidth + Padding.Top,
-                    size.Width - BorderWidth - Padding.Right,
-                    size.Height - BorderWidth - Padding.Bottom));
-            }
+            Child?.Arrange(new Rect(
+                BorderWidth + Padding.Left,
+                BorderWidth + Padding.Top,
+                Child.DesiredSize.Width,
+                Child.DesiredSize.Height));
 
-            return size;
+            return DesiredSize;
         }
 
         protected override void OnRender(DrawingContext drawingContext)