diff --git a/src/Shared/HandyControl_Shared/Controls/Base/AdornerElement.cs b/src/Shared/HandyControl_Shared/Controls/Base/AdornerElement.cs index 17f16f6e..f475dc87 100644 --- a/src/Shared/HandyControl_Shared/Controls/Base/AdornerElement.cs +++ b/src/Shared/HandyControl_Shared/Controls/Base/AdornerElement.cs @@ -34,8 +34,10 @@ public FrameworkElement Target private static void OnInstanceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) { if (d is not FrameworkElement target) return; - var element = (AdornerElement) e.NewValue; - element.OnInstanceChanged(target); + if (e.NewValue is AdornerElement element) + { + element.OnInstanceChanged(target); + } } protected virtual void OnInstanceChanged(FrameworkElement target) => Target = target;