diff --git a/MapControl/Avalonia/MapItemsControl.Avalonia.cs b/MapControl/Avalonia/MapItemsControl.Avalonia.cs
index ddc5b3b2..0e78ce34 100644
--- a/MapControl/Avalonia/MapItemsControl.Avalonia.cs
+++ b/MapControl/Avalonia/MapItemsControl.Avalonia.cs
@@ -61,7 +61,7 @@ namespace MapControl
             }
         }
 
-        protected void SetSelectedItem(object item)
+        protected void ResetSelectedItems(object item)
         {
             SelectedItem = item;
         }
diff --git a/MapControl/Shared/MapItemsControl.cs b/MapControl/Shared/MapItemsControl.cs
index 371c3128..782573f2 100644
--- a/MapControl/Shared/MapItemsControl.cs
+++ b/MapControl/Shared/MapItemsControl.cs
@@ -110,7 +110,7 @@ namespace MapControl
             }
             else
             {
-                SetSelectedItem(item);
+                ResetSelectedItems(item);
             }
         }
     }
diff --git a/MapControl/WPF/MapItemsControl.WPF.cs b/MapControl/WPF/MapItemsControl.WPF.cs
index 91133784..d56ff4a1 100644
--- a/MapControl/WPF/MapItemsControl.WPF.cs
+++ b/MapControl/WPF/MapItemsControl.WPF.cs
@@ -66,7 +66,7 @@ namespace MapControl
             }
         }
 
-        protected void SetSelectedItem(object item)
+        protected void ResetSelectedItems(object item)
         {
             SetSelectedItems(new[] { item });
         }
diff --git a/MapControl/WinUI/MapItemsControl.WinUI.cs b/MapControl/WinUI/MapItemsControl.WinUI.cs
index 45586eb7..eb5fbdda 100644
--- a/MapControl/WinUI/MapItemsControl.WinUI.cs
+++ b/MapControl/WinUI/MapItemsControl.WinUI.cs
@@ -60,9 +60,12 @@ namespace MapControl
             }
         }
 
-        protected void SetSelectedItem(object item)
+        protected void ResetSelectedItems(object item)
         {
-            SelectedItem = item;
+            if (SelectedItem != item || SelectedItems.Count != 1)
+            {
+                SelectedItem = item;
+            }
         }
     }
 }