Merge branch 'master' into patch-1

7 years ago · 683e5a7633
1 changed files with 2 additions and 1 deletions
--- a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
+++ b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
@ -273,7 +273,8 @@ namespace Avalonia.Controls.Platform

            if (item.IsTopLevel)
            {
-                if (item.Parent.SelectedItem?.IsSubMenuOpen == true)
+                if (item != item.Parent.SelectedItem &&
+                    item.Parent.SelectedItem?.IsSubMenuOpen == true)
                {
                    item.Parent.SelectedItem.Close();
                    SelectItemAndAncestors(item);