diff --git a/MapControl/Shared/MapItemsControl.cs b/MapControl/Shared/MapItemsControl.cs
index 17c72261..5fdb4c2c 100644
--- a/MapControl/Shared/MapItemsControl.cs
+++ b/MapControl/Shared/MapItemsControl.cs
@@ -5,9 +5,11 @@
 #if WINDOWS_UWP
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using KeyEventArgs = Windows.UI.Xaml.Input.KeyRoutedEventArgs;
 #else
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Input;
 #endif
 
 namespace MapControl
@@ -46,5 +48,10 @@ namespace MapControl
         {
             return item is MapItem;
         }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            e.Handled = true;
+        }
     }
 }
diff --git a/MapControl/WPF/Themes/Generic.xaml b/MapControl/WPF/Themes/Generic.xaml
index d85e6f7d..64af4352 100644
--- a/MapControl/WPF/Themes/Generic.xaml
+++ b/MapControl/WPF/Themes/Generic.xaml
@@ -18,6 +18,7 @@
         </Setter>
     </Style>
     <Style TargetType="map:MapItem">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="HorizontalAlignment" Value="Stretch"/>
         <Setter Property="VerticalAlignment" Value="Stretch"/>
         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>