From 0244bab5134b4da65405a4e2752af5e623b6e3c4 Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Wed, 26 Jun 2024 22:09:49 +0100
Subject: [PATCH] More edge casesa

---
 Toolkit.UI.Avalonia/InvokeNavigationViewItemAction.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Toolkit.UI.Avalonia/InvokeNavigationViewItemAction.cs b/Toolkit.UI.Avalonia/InvokeNavigationViewItemAction.cs
index 336c802..7c81a73 100644
--- a/Toolkit.UI.Avalonia/InvokeNavigationViewItemAction.cs
+++ b/Toolkit.UI.Avalonia/InvokeNavigationViewItemAction.cs
@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Threading;
 using Avalonia.Xaml.Interactivity;
 using System.Collections;
@@ -43,6 +44,11 @@ public class InvokeNavigationViewItemAction :
                 {
                     if (collection is { Count: > 0 })
                     {
+                        if (collection[SelectedIndex] is ISelectable selectable)
+                        {
+                            selectable.IsSelected = true;
+                        }
+
                         navigationView.SetValue(NavigationView.SelectedItemProperty, collection[SelectedIndex]);
                     }
                 }