diff --git a/components/nicegrid/demos/Basic Demo/Project_Lazarus/basic_demo.lpi b/components/nicegrid/demos/Basic Demo/Project_Lazarus/basic_demo.lpi
index 0e611bc80..15a05ad1c 100644
--- a/components/nicegrid/demos/Basic Demo/Project_Lazarus/basic_demo.lpi	
+++ b/components/nicegrid/demos/Basic Demo/Project_Lazarus/basic_demo.lpi	
@@ -33,7 +33,7 @@
         <PackageName Value="NiceGridLaz"/>
       </Item1>
     </RequiredPackages>
-    <Units Count="8">
+    <Units Count="9">
       <Unit0>
         <Filename Value="basic_demo.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -95,16 +95,24 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Main"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="103"/>
-        <CursorPos X="77" Y="122"/>
+        <CursorPos X="5" Y="15"/>
         <UsageCount Value="24"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit7>
+      <Unit8>
+        <Filename Value="..\..\..\source\nicegrid.pas"/>
+        <UnitName Value="NiceGrid"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="2"/>
+        <TopLine Value="2264"/>
+        <CursorPos X="15" Y="2298"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit8>
     </Units>
-    <JumpHistory Count="3" HistoryIndex="2">
+    <JumpHistory Count="17" HistoryIndex="15">
       <Position1>
         <Filename Value="..\common\main.pas"/>
         <Caret Line="33" Column="22"/>
@@ -117,6 +125,61 @@
         <Filename Value="..\common\main.pas"/>
         <Caret Line="112" Column="13" TopLine="106"/>
       </Position3>
+      <Position4>
+        <Filename Value="..\common\main.pas"/>
+        <Caret Line="117" Column="58" TopLine="103"/>
+      </Position4>
+      <Position5>
+        <Filename Value="..\common\main.pas"/>
+        <Caret Line="15" Column="5"/>
+      </Position5>
+      <Position6>
+        <Filename Value="..\..\..\source\nicegrid.pas"/>
+        <Caret Line="12" Column="28"/>
+      </Position6>
+      <Position7>
+        <Filename Value="..\..\..\source\nicegrid.pas"/>
+        <Caret Line="396" Column="21" TopLine="367"/>
+      </Position7>
+      <Position8>
+        <Filename Value="..\..\..\source\nicegrid.pas"/>
+        <Caret Line="662" Column="9" TopLine="632"/>
+      </Position8>
+      <Position9>
+        <Filename Value="..\..\..\source\nicegrid.pas"/>
+        <Caret Line="754" Column="11" TopLine="754"/>
+      </Position9>
+      <Position10>
+        <Filename Value="..\..\..\source\nicegrid.pas"/>
+      </Position10>
+      <Position11>
+        <Filename Value="..\..\..\source\nicegrid.pas"/>
+        <Caret Line="396" Column="21" TopLine="367"/>
+      </Position11>
+      <Position12>
+        <Filename Value="..\..\..\source\nicegrid.pas"/>
+        <Caret Line="662" Column="9" TopLine="632"/>
+      </Position12>
+      <Position13>
+        <Filename Value="..\..\..\source\nicegrid.pas"/>
+        <Caret Line="396" Column="15" TopLine="379"/>
+      </Position13>
+      <Position14>
+        <Filename Value="..\..\..\source\nicegrid.pas"/>
+        <Caret Line="820" Column="20" TopLine="802"/>
+      </Position14>
+      <Position15>
+        <Filename Value="..\..\..\source\nicegrid.pas"/>
+        <Caret Line="401" Column="32" TopLine="379"/>
+      </Position15>
+      <Position16>
+        <Filename Value="..\..\..\source\nicegrid.pas"/>
+        <Caret Line="2289" Column="18" TopLine="2265"/>
+      </Position16>
+      <Position17>
+        <Filename Value="..\..\..\source\nicegrid.pas"/>
+        <Caret Line="420" Column="14" TopLine="402"/>
+      </Position17>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/components/nicegrid/source/nicegrid.pas b/components/nicegrid/source/nicegrid.pas
index cdf7a7354..0f4dc6f62 100644
--- a/components/nicegrid/source/nicegrid.pas
+++ b/components/nicegrid/source/nicegrid.pas
@@ -397,6 +397,7 @@ type
     procedure CreateWnd; override;
     procedure CreateParams(var Params: TCreateParams); override;
     procedure Paint; override;
+    procedure Loaded; override;
     procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override;
     procedure MouseMove(Shift: TShiftState; X, Y: Integer); override;
     procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override;
@@ -822,6 +823,8 @@ var
   end;
 
 begin
+  if csLoading in ComponentState then
+    exit;
 
   BuildMergeData;
 
@@ -2289,6 +2292,12 @@ begin
 
 end;
 
+procedure TNiceGrid.Loaded;
+begin
+  inherited;
+  Recalculate;
+end;
+
 procedure TNiceGrid.MouseDown(Button: TMouseButton; Shift: TShiftState; X,
   Y: Integer);
 var