diff --git a/MapControl/Shared/MapItemsControl.cs b/MapControl/Shared/MapItemsControl.cs
index f5da9242..3275762b 100644
--- a/MapControl/Shared/MapItemsControl.cs
+++ b/MapControl/Shared/MapItemsControl.cs
@@ -26,11 +26,6 @@ namespace MapControl
     /// </summary>
     public partial class MapItem : ListBoxItem
     {
-        public static readonly DependencyProperty LocationMemberPathProperty = DependencyProperty.Register(
-            nameof(LocationMemberPath), typeof(string), typeof(MapItem),
-            new PropertyMetadata(null, (o, e) => BindingOperations.SetBinding(
-                o, LocationProperty, new Binding { Path = new PropertyPath((string)e.NewValue) })));
-
         /// <summary>
         /// Gets/sets MapPanel.AutoCollapse.
         /// </summary>
@@ -48,15 +43,6 @@ namespace MapControl
             get => (Location)GetValue(LocationProperty);
             set => SetValue(LocationProperty, value);
         }
-
-        /// <summary>
-        /// Path to a source property for binding the Location property.
-        /// </summary>
-        public string LocationMemberPath
-        {
-            get => (string)GetValue(LocationMemberPathProperty);
-            set => SetValue(LocationMemberPathProperty, value);
-        }
     }
 
     /// <summary>
@@ -64,6 +50,18 @@ namespace MapControl
     /// </summary>
     public partial class MapItemsControl : ListBox
     {
+        public static readonly DependencyProperty LocationMemberPathProperty = DependencyProperty.Register(
+            nameof(LocationMemberPath), typeof(string), typeof(MapItemsControl), new PropertyMetadata(null));
+
+        /// <summary>
+        /// Path to a source property for binding the Location property of MapItem containers.
+        /// </summary>
+        public string LocationMemberPath
+        {
+            get => (string)GetValue(LocationMemberPathProperty);
+            set => SetValue(LocationMemberPathProperty, value);
+        }
+
         protected override DependencyObject GetContainerForItemOverride()
         {
             return new MapItem();
@@ -74,6 +72,31 @@ namespace MapControl
             return item is MapItem;
         }
 
+        protected override void PrepareContainerForItemOverride(DependencyObject element, object item)
+        {
+            base.PrepareContainerForItemOverride(element, item);
+
+            if (LocationMemberPath != null && element is MapItem mapItem)
+            {
+                mapItem.SetBinding(MapItem.LocationProperty,
+                    new Binding
+                    {
+                        Path = new PropertyPath(LocationMemberPath),
+                        Source = item
+                    });
+            }
+        }
+
+        protected override void ClearContainerForItemOverride(DependencyObject element, object item)
+        {
+            base.ClearContainerForItemOverride(element, item);
+
+            if (LocationMemberPath != null && element is MapItem mapItem)
+            {
+                mapItem.ClearValue(MapItem.LocationProperty);
+            }
+        }
+
         public void SelectItems(Predicate<object> predicate)
         {
             if (SelectionMode == SelectionMode.Single)
diff --git a/SampleApps/UniversalApp/MainPage.xaml b/SampleApps/UniversalApp/MainPage.xaml
index f3cb3e11..7f0a7280 100644
--- a/SampleApps/UniversalApp/MainPage.xaml
+++ b/SampleApps/UniversalApp/MainPage.xaml
@@ -13,7 +13,6 @@
 
             <Style x:Key="PointItemStyle" TargetType="map:MapItem">
                 <Setter Property="AutoCollapse" Value="True"/>
-                <Setter Property="LocationMemberPath" Value="Location"/>
                 <Setter Property="FontSize" Value="12"/>
                 <Setter Property="Template">
                     <Setter.Value>
@@ -68,7 +67,6 @@
 
             <Style x:Key="PushpinItemStyle" TargetType="map:MapItem">
                 <Setter Property="AutoCollapse" Value="True"/>
-                <Setter Property="LocationMemberPath" Value="Location"/>
                 <Setter Property="HorizontalAlignment" Value="Center"/>
                 <Setter Property="VerticalAlignment" Value="Bottom"/>
                 <Setter Property="Template">
@@ -99,10 +97,12 @@
 
             <map:MapItemsControl ItemsSource="{Binding Points}"
                                  ItemContainerStyle="{StaticResource PointItemStyle}"
+                                 LocationMemberPath="Location"
                                  SelectionMode="Extended"/>
 
             <map:MapItemsControl ItemsSource="{Binding Pushpins}"
-                                 ItemContainerStyle="{StaticResource PushpinItemStyle}"/>
+                                 ItemContainerStyle="{StaticResource PushpinItemStyle}"
+                                 LocationMemberPath="Location"/>
 
             <map:Pushpin AutoCollapse="True" Content="N 53°30' E 8°12'">
                 <map:Pushpin.Location>
diff --git a/SampleApps/WinUiApp/MainWindow.xaml b/SampleApps/WinUiApp/MainWindow.xaml
index e0808488..f817f09b 100644
--- a/SampleApps/WinUiApp/MainWindow.xaml
+++ b/SampleApps/WinUiApp/MainWindow.xaml
@@ -20,7 +20,6 @@
 
             <Style x:Key="PointItemStyle" TargetType="map:MapItem">
                 <Setter Property="AutoCollapse" Value="True"/>
-                <Setter Property="LocationMemberPath" Value="Location"/>
                 <Setter Property="FontSize" Value="12"/>
                 <Setter Property="Template">
                     <Setter.Value>
@@ -75,7 +74,6 @@
 
             <Style x:Key="PushpinItemStyle" TargetType="map:MapItem">
                 <Setter Property="AutoCollapse" Value="True"/>
-                <Setter Property="LocationMemberPath" Value="Location"/>
                 <Setter Property="HorizontalAlignment" Value="Center"/>
                 <Setter Property="VerticalAlignment" Value="Bottom"/>
                 <Setter Property="Template">
@@ -106,10 +104,12 @@
 
             <map:MapItemsControl ItemsSource="{Binding Points}"
                                  ItemContainerStyle="{StaticResource PointItemStyle}"
+                                 LocationMemberPath="Location"
                                  SelectionMode="Extended"/>
 
             <map:MapItemsControl ItemsSource="{Binding Pushpins}"
-                                 ItemContainerStyle="{StaticResource PushpinItemStyle}"/>
+                                 ItemContainerStyle="{StaticResource PushpinItemStyle}"
+                                 LocationMemberPath="Location"/>
 
             <map:Pushpin AutoCollapse="True" Content="N 53°30' E 8°12'">
                 <map:Pushpin.Location>