diff --git a/components/ideintf/objectinspector.pp b/components/ideintf/objectinspector.pp
index dbc2d0280a..283ab63a47 100644
--- a/components/ideintf/objectinspector.pp
+++ b/components/ideintf/objectinspector.pp
@@ -1985,6 +1985,9 @@ procedure TOICustomPropertyGrid.AddSubEditor(PropEditor:TPropertyEditor);
 var NewRow:TOIPropertyGridRow;
   NewIndex:integer;
 begin
+  if not EditorFilter(PropEditor) then
+    Exit;
+
   if PropEditor is TClassPropertyEditor then
     (PropEditor as TClassPropertyEditor).SubPropsTypeFilter := FFilter;
   if PropEditor is TClassPropertyEditor then