diff --git a/lcl/forms.pp b/lcl/forms.pp
index 26c41d72d4..45fbcc921c 100644
--- a/lcl/forms.pp
+++ b/lcl/forms.pp
@@ -611,9 +611,9 @@ type
                           var Message : TLMessage): Boolean; virtual;
 
     // handlers
+    procedure RemoveAllHandlersOfObject(AnObject: TObject); override;
     procedure AddHandlerFirstShow(OnFirstShowHandler: TNotifyEvent;
                                   AsFirst: Boolean=true);
-    procedure RemoveAllHandlersOfObject(AnObject: TObject); override;
     procedure RemoveHandlerFirstShow(OnFirstShowHandler: TNotifyEvent);
     procedure AddHandlerClose(OnCloseHandler: TCloseEvent; AsFirst: Boolean=true);
     procedure RemoveHandlerClose(OnCloseHandler: TCloseEvent);
@@ -1575,7 +1575,7 @@ type
 
   TFormPropertyStorage = class(TControlPropertyStorage)
   private
-    procedure FormFirstShow(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
   public
     constructor Create(TheOwner: TComponent); override;
diff --git a/lcl/include/customform.inc b/lcl/include/customform.inc
index 1700e87284..e69efaff9c 100644
--- a/lcl/include/customform.inc
+++ b/lcl/include/customform.inc
@@ -2844,7 +2844,7 @@ end;
 
 { TFormPropertyStorage }
 
-procedure TFormPropertyStorage.FormFirstShow(Sender: TObject);
+procedure TFormPropertyStorage.FormCreate(Sender: TObject);
 begin
   Restore;
 end;
@@ -2859,7 +2859,7 @@ begin
   inherited Create(TheOwner);
   if Owner is TCustomForm then
   begin
-    TCustomForm(Owner).AddHandlerFirstShow(@FormFirstShow, True);
+    TCustomForm(Owner).AddHandlerCreate(@FormCreate, True);
     TCustomForm(Owner).AddHandlerClose(@FormClose, True);
   end;
 end;