diff --git a/SampleApps/WpfApplication/MainWindow.xaml b/SampleApps/WpfApplication/MainWindow.xaml
index 331d41f2..f54652ff 100644
--- a/SampleApps/WpfApplication/MainWindow.xaml
+++ b/SampleApps/WpfApplication/MainWindow.xaml
@@ -238,9 +238,7 @@
                     <Image Source="10_535_330.jpg" Stretch="Fill"
                         map:MapPanel.BoundingBox="53.54031,8.08594,53.74871,8.43750"/>
                 </tools:MapOverlayMenuItem>
-                <tools:MapOverlayMenuItem Text="Mount Etna KML">
-                    <map:GroundOverlay SourcePath="etna.kml"/>
-                </tools:MapOverlayMenuItem>
+                <tools:MapOverlayMenuItem x:Name="sampleOverlayMenuItem" Text="Mount Etna KML"/>
                 <tools:MapOverlayMenuItem Text="Seamarks">
                     <map:MapTileLayer
                         TileSource="http://tiles.openseamap.org/seamark/{z}/{x}/{y}.png"
diff --git a/SampleApps/WpfApplication/MainWindow.xaml.cs b/SampleApps/WpfApplication/MainWindow.xaml.cs
index 9f5b3a7e..d094ac4a 100644
--- a/SampleApps/WpfApplication/MainWindow.xaml.cs
+++ b/SampleApps/WpfApplication/MainWindow.xaml.cs
@@ -20,6 +20,9 @@ namespace SampleApplication
             Closed += (s, e) => (TileImageLoader.Cache as IDisposable)?.Dispose();
 
             InitializeComponent();
+
+            sampleOverlayMenuItem.MapLayerFactory = async () => await GroundOverlay.CreateAsync("etna.kml");
+
             AddTestLayers();
         }
 
@@ -142,65 +145,5 @@ namespace SampleApplication
 
             return string.Format(CultureInfo.InvariantCulture, "\n   {0:" + distanceFormat + "} {1}", distance, unit);
         }
-
-        private void MapItemsControl_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            Debug.WriteLine("PreviewMouseLeftButtonDown");
-        }
-
-        private void MapItemsControl_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
-        {
-            Debug.WriteLine("PreviewMouseLeftButtonUp");
-        }
-
-        private void MapItemsControl_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            Debug.WriteLine("MouseLeftButtonDown");
-        }
-
-        private void MapItemsControl_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
-        {
-            Debug.WriteLine("MouseLeftButtonUp");
-        }
-
-        private void MapItemsControl_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            Debug.WriteLine("PreviewMouseRightButtonDown");
-        }
-
-        private void MapItemsControl_PreviewMouseRightButtonUp(object sender, MouseButtonEventArgs e)
-        {
-            Debug.WriteLine("PreviewMouseRightButtonUp");
-        }
-
-        private void MapItemsControl_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            Debug.WriteLine("MouseRightButtonDown");
-        }
-
-        private void MapItemsControl_MouseRightButtonUp(object sender, MouseButtonEventArgs e)
-        {
-            Debug.WriteLine("MouseRightButtonUp");
-        }
-
-        private void MapItemsControl_TouchDown(object sender, TouchEventArgs e)
-        {
-            Debug.WriteLine("TouchDown");
-        }
-
-        private void MapItemsControl_TouchUp(object sender, TouchEventArgs e)
-        {
-            Debug.WriteLine("TouchUp");
-        }
-
-        private void MapItemsControl_PreviewTouchDown(object sender, TouchEventArgs e)
-        {
-            Debug.WriteLine("PreviewTouchDown");
-        }
-
-        private void MapItemsControl_PreviewTouchUp(object sender, TouchEventArgs e)
-        {
-            Debug.WriteLine("PreviewTouchUp");
-        }
     }
 }