diff --git a/components/ideintf/formeditingintf.pas b/components/ideintf/formeditingintf.pas
index 5b736b389b..9c5d28fc02 100644
--- a/components/ideintf/formeditingintf.pas
+++ b/components/ideintf/formeditingintf.pas
@@ -242,7 +242,7 @@ type
     function DesignerBaseClassCount: Integer; virtual; abstract;
     property DesignerBaseClasses[Index: integer]: TComponentClass read GetDesignerBaseClasses;
     procedure UnregisterDesignerBaseClass(AClass: TComponentClass); virtual; abstract;
-    function IndexOfDesignerBaseClass(AClass: TComponentClass): integer; virtual; abstract;
+    function IndexOfDesignerBaseClass(AClass: TComponentClass): integer; virtual; abstract; // search exact match
     function DescendFromDesignerBaseClass(AClass: TComponentClass): integer; virtual; abstract;
     function FindDesignerBaseClassByName(const AClassName: shortstring; WithDefaults: boolean): TComponentClass; virtual; abstract;
     function DesignerClassCanAppCreateForm(AClass: TComponentClass; CheckInherited: boolean = true): boolean; virtual; abstract;
diff --git a/ide/sourcefilemanager.pas b/ide/sourcefilemanager.pas
index 3ce690ae25..8e236ef25b 100644
--- a/ide/sourcefilemanager.pas
+++ b/ide/sourcefilemanager.pas
@@ -8345,7 +8345,7 @@ begin
     exit('TCustomFrame')
   else if aCompClass.InheritsFrom(TDataModule) then
     exit(DefaultResourceBaseClassnames[pfcbcDataModule]);
-  i:=FormEditingHook.IndexOfDesignerBaseClass(TComponentClass(aCompClass.ClassType));
+  i:=FormEditingHook.DescendFromDesignerBaseClass(TComponentClass(aCompClass.ClassType));
   if i<0 then exit;
   Result:=FormEditingHook.DesignerBaseClasses[i].ClassName;
 end;
diff --git a/packager/packagedefs.pas b/packager/packagedefs.pas
index 1ec61f6c99..e0026c0d9f 100644
--- a/packager/packagedefs.pas
+++ b/packager/packagedefs.pas
@@ -124,7 +124,7 @@ const
     'Frame',
     'DataModule',
     'CustomForm',
-    ''
+    'Other'
     );
   DefaultResourceBaseClassnames: array[TPFComponentBaseClass] of string = (
     '',