diff --git a/designer/designer.pp b/designer/designer.pp
index c0edee90d9..42e708c59f 100644
--- a/designer/designer.pp
+++ b/designer/designer.pp
@@ -39,7 +39,7 @@ uses
   Classes, LCLType, LCLLinux, Forms, Controls, LMessages, GraphType, Graphics,
   ControlSelection, CustomFormEditor, FormEditor, UnitEditor, CompReg, Menus,
   AlignCompsDlg, SizeCompsDlg, ScaleCompsDlg, ExtCtrls, EnvironmentOpts,
-  DesignerProcs;
+  DesignerProcs, PropEdits, ComponentEditors;
 
 type
   TDesigner = class;
@@ -58,7 +58,7 @@ type
   TOnRenameComponent = procedure(Designer: TDesigner; AComponent: TComponent;
     const NewName: string) of object;
 
-  TDesigner = class(TIDesigner)
+  TDesigner = class(TComponentEditorDesigner)
   private
     FCustomForm: TCustomForm;
     FFormEditor : TFormEditor;
@@ -135,6 +135,8 @@ type
     procedure OnBringToFrontMenuClick(Sender: TObject);
     procedure OnSendToBackMenuClick(Sender: TObject);
     Procedure OnFormActivated;
+    
+    function GetPropertyEditorHook: TPropertyEditorHook; override;
   public
     ControlSelection : TControlSelection;
     DDC: TDesignerDeviceContext;
@@ -1337,6 +1339,11 @@ begin
      FOnActivated(Form);
 end;
 
+function TDesigner.GetPropertyEditorHook: TPropertyEditorHook;
+begin
+  Result:=FormEditor.PropertyEditorHook;
+end;
+
 
 end.