diff --git a/src/Avalonia.Base/StyledElement.cs b/src/Avalonia.Base/StyledElement.cs index ecf5d95ffc..3a42e9bdfe 100644 --- a/src/Avalonia.Base/StyledElement.cs +++ b/src/Avalonia.Base/StyledElement.cs @@ -873,9 +873,12 @@ namespace Avalonia if (applied.Source == styles[i]) { - applied.Dispose(); _appliedStyles.RemoveAt(j); + applied.Dispose(); } + + if (j > _appliedStyles.Count) + j = _appliedStyles.Count; } } }