diff --git a/Directory.Build.props b/Directory.Build.props
index 8d833d00..8eab3b55 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,7 +3,7 @@
         <Product>XAML Map Control</Product>
         <Authors>Clemens Fischer</Authors>
         <Copyright>Copyright © 2025 Clemens Fischer</Copyright>
-        <Version>13.3.0</Version>
+        <Version>13.4.0</Version>
         <AssemblyVersion>$(Version)</AssemblyVersion>
         <AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
         <SignAssembly>true</SignAssembly>
diff --git a/MapControl/WPF/MapItem.WPF.cs b/MapControl/WPF/MapItem.WPF.cs
index 6e91f2ca..9065c736 100644
--- a/MapControl/WPF/MapItem.WPF.cs
+++ b/MapControl/WPF/MapItem.WPF.cs
@@ -30,37 +30,18 @@ namespace MapControl
 
         protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
         {
-            e.Handled = true;
-        }
-
-        protected override void OnMouseRightButtonDown(MouseButtonEventArgs e)
-        {
-            e.Handled = true;
-        }
-
-        protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
-        {
-            if (ItemsControl.ItemsControlFromItemContainer(this) is MapItemsControl mapItemsControl)
+            if (Keyboard.Modifiers.HasFlag(ModifierKeys.Shift) &&
+                ItemsControl.ItemsControlFromItemContainer(this) is MapItemsControl mapItemsControl &&
+                mapItemsControl.SelectionMode == SelectionMode.Extended)
             {
-                if (mapItemsControl.SelectionMode == SelectionMode.Extended &&
-                    Keyboard.Modifiers.HasFlag(ModifierKeys.Shift))
-                {
-                    mapItemsControl.SelectItemsInRange(this);
-                }
-                else
-                {
-                    // Perform default mouse down item selection on mouse up.
-                    //
-                    base.OnMouseLeftButtonDown(e);
-                }
+                mapItemsControl.SelectItemsInRange(this);
+                e.Handled = true;
+            }
+            else
+            {
+                base.OnMouseLeftButtonDown(e);
             }
 
-            e.Handled = true;
-        }
-
-        protected override void OnMouseRightButtonUp(MouseButtonEventArgs e)
-        {
-            OnMouseLeftButtonUp(e);
         }
     }
 }