diff --git a/src/Avalonia.Controls/MenuItem.cs b/src/Avalonia.Controls/MenuItem.cs index 91f427936c..7b57783c5a 100644 --- a/src/Avalonia.Controls/MenuItem.cs +++ b/src/Avalonia.Controls/MenuItem.cs @@ -342,7 +342,7 @@ namespace Avalonia.Controls if (menuItem != null && menuItem.Parent == this) { - foreach (var child in Items.OfType()) + foreach (var child in ((IMenuItem)this).SubItems) { if (child != menuItem && child.IsSubMenuOpen) { @@ -368,12 +368,9 @@ namespace Avalonia.Controls /// private void CloseSubmenus() { - if (Items != null) + foreach (var child in ((IMenuItem)this).SubItems) { - foreach (var child in Items.OfType()) - { - child.IsSubMenuOpen = false; - } + child.IsSubMenuOpen = false; } }