diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs index 23d3da7f..1d814a2c 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs @@ -385,12 +385,15 @@ namespace Microsoft.Windows.Controls.PropertyGrid private void GetChildProperties() { - PropertyDescriptorCollection descriptors = PropertyDescriptor.GetChildProperties(); + if (Value == null) + return; var propertyItems = new List(); try { + PropertyDescriptorCollection descriptors = PropertyGridUtilities.GetPropertyDescriptors(Value); + foreach (PropertyDescriptor descriptor in descriptors) { if (descriptor.IsBrowsable)