diff --git a/MapControl/Avalonia/DependencyPropertyHelper.Avalonia.cs b/MapControl/Avalonia/DependencyPropertyHelper.Avalonia.cs
index 35ad2773..a41ebe03 100644
--- a/MapControl/Avalonia/DependencyPropertyHelper.Avalonia.cs
+++ b/MapControl/Avalonia/DependencyPropertyHelper.Avalonia.cs
@@ -61,5 +61,12 @@ namespace MapControl
         {
             return property.AddOwner<TOwner>();
         }
+
+        public static StyledProperty<TValue> AddOwner<TOwner, TValue>(
+            AvaloniaProperty property)
+            where TOwner : AvaloniaObject
+        {
+            return AddOwner<TOwner, TValue>((StyledProperty<TValue>)property);
+        }
     }
 }
diff --git a/MapControl/Avalonia/MapContentControl.Avalonia.cs b/MapControl/Avalonia/MapContentControl.Avalonia.cs
new file mode 100644
index 00000000..a925fd90
--- /dev/null
+++ b/MapControl/Avalonia/MapContentControl.Avalonia.cs
@@ -0,0 +1,49 @@
+// XAML Map Control - https://github.com/ClemensFischer/XAML-Map-Control
+// Copyright © 2024 Clemens Fischer
+// Licensed under the Microsoft Public License (Ms-PL)
+
+using Avalonia.Controls;
+using System;
+
+namespace MapControl
+{
+    /// <summary>
+    /// ContentControl placed on a MapPanel at a geographic location specified by the Location property.
+    /// </summary>
+    public class MapContentControl : ContentControl
+    {
+        public static readonly StyledProperty<bool> AutoCollapseProperty =
+            DependencyPropertyHelper.AddOwner<MapContentControl, bool>(MapPanel.AutoCollapseProperty);
+
+        public static readonly StyledProperty<Location> LocationProperty =
+            DependencyPropertyHelper.AddOwner<MapContentControl, Location>(MapPanel.LocationProperty);
+
+        protected override Type StyleKeyOverride => typeof(MapContentControl);
+
+        /// <summary>
+        /// Gets/sets MapPanel.AutoCollapse.
+        /// </summary>
+        public bool AutoCollapse
+        {
+            get => GetValue(AutoCollapseProperty);
+            set => SetValue(AutoCollapseProperty, value);
+        }
+
+        /// <summary>
+        /// Gets/sets MapPanel.Location.
+        /// </summary>
+        public Location Location
+        {
+            get => GetValue(LocationProperty);
+            set => SetValue(LocationProperty, value);
+        }
+    }
+
+    /// <summary>
+    /// MapContentControl with a Pushpin Style.
+    /// </summary>
+    public class Pushpin : MapContentControl
+    {
+        protected override Type StyleKeyOverride => typeof(Pushpin);
+    }
+}