diff --git a/ChangeLog.md b/ChangeLog.md
index a994b4a..24d3df9 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,6 +1,7 @@
 * Thu Dec 28 2017 Ivo <ivo.brhel at gmail.com>
 ---------------------
 + Fixed Template AdjustSize
++ Fixed EditEntryForm Template AdjustSize
 
 
 * Mon Dec 4 2017 Ivo <ivo.brhel at gmail.com>
diff --git a/Source/TemplateCtrl.pas b/Source/TemplateCtrl.pas
index 2254741..20686fd 100644
--- a/Source/TemplateCtrl.pas
+++ b/Source/TemplateCtrl.pas
@@ -593,7 +593,7 @@ procedure THeaderPanel.SetRolled(const Value: Boolean);
 procedure THeaderPanel.SetTemplatePanel(APanel: TTemplatePanel);
 begin
   fTemplatePanel := APanel;
-  fTemplatePanel.Parent := Self;
+  fTemplatePanel.Parent := Self.Parent;
   fTemplatePanel.Width := Width;
   AdjustHeight;
 end;