diff --git a/Sample Applications/WPFGallery/MainWindow.xaml b/Sample Applications/WPFGallery/MainWindow.xaml
index be5cd00c..bfd66097 100644
--- a/Sample Applications/WPFGallery/MainWindow.xaml	
+++ b/Sample Applications/WPFGallery/MainWindow.xaml	
@@ -217,7 +217,7 @@
                         AutomationProperties.Name="Navigation Pane"
                         ItemsSource="{Binding ViewModel.Controls}"
                         PreviewKeyDown="ControlsList_PreviewKeyDown"
-                        PreviewMouseLeftButtonUp="ControlsList_PreviewMouseLeftButtonUp"
+                        SelectedItemChanged="ControlsList_SelectedItemChanged"
                         Loaded="ControlsList_Loaded">
                         <TreeView.ItemTemplate>
                             <HierarchicalDataTemplate ItemsSource="{Binding Items}">
diff --git a/Sample Applications/WPFGallery/MainWindow.xaml.cs b/Sample Applications/WPFGallery/MainWindow.xaml.cs
index d5ff6352..7f09aa81 100644
--- a/Sample Applications/WPFGallery/MainWindow.xaml.cs	
+++ b/Sample Applications/WPFGallery/MainWindow.xaml.cs	
@@ -177,7 +177,6 @@ private void OnNavigating(object? sender, NavigatingEventArgs e)
             if(selectedTreeViewItem != null)
             {
                 selectedTreeViewItem.IsSelected = true;
-                ControlsList_SelectedItemChanged();
             }
         }
     }
@@ -262,16 +261,15 @@ private void ResizeNavChevrons()
 
     private void SelectedItemChanged(TreeViewItem? tvi)
     {
-        ControlsList_SelectedItemChanged();
         if (tvi != null)
         {
             tvi.IsExpanded = !tvi.IsExpanded;
         }
     }
 
-    private void ControlsList_SelectedItemChanged()
+    private void ControlsList_SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
     {
-        if (ControlsList.SelectedItem is ControlInfoDataItem navItem)
+        if (e.NewValue is ControlInfoDataItem navItem)
         {
             _navigationService.Navigate(navItem.PageType);
             var tvi = ControlsList.ItemContainerGenerator.ContainerFromItem(navItem) as TreeViewItem;