diff --git a/Bitvault.Avalonia/VaultNavigationView.axaml b/Bitvault.Avalonia/VaultNavigationView.axaml
index 8ae8d14..dbfbda3 100644
--- a/Bitvault.Avalonia/VaultNavigationView.axaml
+++ b/Bitvault.Avalonia/VaultNavigationView.axaml
@@ -9,6 +9,7 @@
     IsExpanded="{Binding Expanded, Mode=TwoWay}"
     IsSelected="{Binding Selected}"
     MenuItemsSource="{Binding}"
+    NavigationViewItemExtension.IsItemClickEnabled="True"
     SelectsOnInvoked="True">
     <Interaction.Behaviors>
         <DataTriggerBehavior Binding="{Binding Opened}" Value="False">
@@ -40,7 +41,7 @@
                 <SelectNavigationViewItemAction />
             </ConditionAction>
         </DataTriggerBehavior>
-        <NavigationViewItemInvokedBehaviour SelectsChildOnInvoked="True">
+        <AttachedEventTriggerBehaviour RoutedEvent="{x:Static NavigationViewItemExtension.ItemClickEvent}">
             <ConditionAction>
                 <ConditionAction.Condition>
                     <ConditionalExpression ForwardChaining="And">
@@ -58,7 +59,8 @@
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Context="Main" Route="Vault" />
+                <SelectNavigationViewItemAction />
             </ConditionAction>
-        </NavigationViewItemInvokedBehaviour>
+        </AttachedEventTriggerBehaviour>
     </Interaction.Behaviors>
 </NavigationViewItem>
diff --git a/Bitvault.Avalonia/VaultNavigationView.axaml.cs b/Bitvault.Avalonia/VaultNavigationView.axaml.cs
index 07d859f..f7c42d4 100644
--- a/Bitvault.Avalonia/VaultNavigationView.axaml.cs
+++ b/Bitvault.Avalonia/VaultNavigationView.axaml.cs
@@ -1,3 +1,4 @@
+using Toolkit.UI.Avalonia;
 using Toolkit.UI.Controls.Avalonia;
 
 namespace Bitvault.Avalonia
@@ -8,5 +9,10 @@ namespace Bitvault.Avalonia
         {
             InitializeComponent();
         }
+
+        public void Test(object? sender, ItemInvokedEventArgs args)
+        {
+
+        }
     }
 }
\ No newline at end of file