diff --git a/Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItemCollection.cs b/Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItemCollection.cs
index d5762cea..5dd59f34 100644
--- a/Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItemCollection.cs
+++ b/Main/Source/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItemCollection.cs
@@ -41,6 +41,9 @@ namespace Microsoft.Windows.Controls.PropertyGrid
 
         public void Filter(string text)
         {
+            if (text == null)
+                return;
+
             GetDefaultView().Filter = (item) => 
             {
                 var property = item as PropertyItem;