From 3e09bdfd093d9695f3ec1a5dea1b8b8c089b062a Mon Sep 17 00:00:00 2001
From: amwx <armccormickwx@gmail.com>
Date: Fri, 26 Mar 2021 15:32:41 -0500
Subject: [PATCH] Try fix subitems

---
 src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs b/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
index 95a4c7a764..92f414631a 100644
--- a/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
+++ b/src/Avalonia.Controls/Flyouts/MenuFlyoutPresenter.cs
@@ -29,7 +29,16 @@ namespace Avalonia.Controls
             var host = this.FindLogicalAncestorOfType<Popup>();
             if (host != null)
             {
-                host.IsOpen = false;
+                for (int i = 0; i < LogicalChildren.Count; i++)
+                {
+                    if (LogicalChildren[i] is MenuItem item)
+                    {
+                        item.IsSubMenuOpen = false;
+                    }
+                }
+
+                SelectedIndex = -1;
+                host.IsOpen = false;                
             }
         }