diff --git a/components/fpspreadsheet/examples/visual/zoom/zdmain.pas b/components/fpspreadsheet/examples/visual/zoom/zdmain.pas
index 39d40f8e6..e1be668fc 100644
--- a/components/fpspreadsheet/examples/visual/zoom/zdmain.pas
+++ b/components/fpspreadsheet/examples/visual/zoom/zdmain.pas
@@ -100,12 +100,6 @@ procedure TMainForm.FormCreate(Sender: TObject);
 var
   priorityFormats: Array[0..7] of TsSpreadFormatID;
 begin
-  {
-  Grid.RowCount:=2;
-  Grid.ColCount:=2;
-  Grid.AutoExpand:= [];
-  }
-
   priorityFormats[0] := ord(sfOOXML);
   priorityFormats[1] := ord(sfExcel8);
   priorityFormats[2] := ord(sfExcel5);
diff --git a/components/fpspreadsheet/fpspreadsheetgrid.pas b/components/fpspreadsheet/fpspreadsheetgrid.pas
index 7a5b1b80c..06462038c 100644
--- a/components/fpspreadsheet/fpspreadsheetgrid.pas
+++ b/components/fpspreadsheet/fpspreadsheetgrid.pas
@@ -238,6 +238,8 @@ type
     procedure MoveSelection; override;
     procedure Notification(AComponent: TComponent; Operation: TOperation); override;
     procedure PrepareCanvasFont;
+    function RelaxAutoExpand: TsAutoExpandModes;
+    procedure RestoreAutoExpand(AValue: TsAutoExpandModes);
     procedure SelPenChangeHandler(Sender: TObject);
     procedure SetEditText(ACol, ARow: Longint; const AValue: string); override;
     procedure Setup;
@@ -3945,9 +3947,12 @@ end;
 -------------------------------------------------------------------------------}
 procedure TsCustomWorksheetGrid.LoadFromSpreadsheetFile(AFileName: string;
   AFormat: TsSpreadsheetFormat; AWorksheetIndex: Integer);
+var
+  ae: TsAutoExpandModes;
 begin
-//  ZoomFactor := 1.0;
+  ae := RelaxAutoExpand;
   GetWorkbookSource.LoadFromSpreadsheetFile(AFileName, AFormat, AWorksheetIndex);
+  RestoreAutoExpand(ae);
 end;
 
 {@@ ----------------------------------------------------------------------------
@@ -3964,9 +3969,12 @@ end;
 -------------------------------------------------------------------------------}
 procedure TsCustomWorksheetGrid.LoadFromSpreadsheetFile(AFileName: string;
   AFormatID: TsSpreadFormatID = sfidUnknown; AWorksheetIndex: Integer = -1);
+var
+  ae: TsAutoExpandModes;
 begin
-//  ZoomFactor := 1.0;
+  ae := RelaxAutoExpand;
   GetWorkbookSource.LoadFromSpreadsheetFile(AFileName, AFormatID, AWorksheetIndex);
+  RestoreAutoExpand(ae);
 end;
 
 {@@ ----------------------------------------------------------------------------
@@ -3981,9 +3989,12 @@ end;
 -------------------------------------------------------------------------------}
 procedure TsCustomWorksheetGrid.LoadSheetFromSpreadsheetFile(AFileName: String;
   AWorksheetIndex: Integer = -1; AFormatID: TsSpreadFormatID = sfidUnknown);
+var
+  ae: TsAutoExpandModes;
 begin
-//  ZoomFactor := 1.0;
+  ae := RelaxAutoExpand;
   GetWorkbookSource.LoadFromSpreadsheetFile(AFilename, AFormatID, AWorksheetIndex);
+  RestoreAutoExpand(ae);
 end;
 
 {@@ ----------------------------------------------------------------------------
@@ -3998,9 +4009,12 @@ end;
 -------------------------------------------------------------------------------}
 procedure TsCustomWorksheetGrid.LoadFromWorkbook(AWorkbook: TsWorkbook;
   AWorksheetIndex: Integer = -1);
+var
+  ae: TsAutoExpandModes;
 begin
-//  ZoomFactor := 1.0;
+  ae := RelaxAutoExpand;
   GetWorkbookSource.LoadFromWorkbook(AWorkbook, AWorksheetIndex);
+  RestoreAutoExpand(ae);
   Invalidate;
 end;
 
@@ -4297,6 +4311,17 @@ begin
   Canvas.Font.Height := Round(ZoomFactor * Canvas.Font.Height);
 end;
 
+function TsCustomWorksheetGrid.RelaxAutoExpand: TsAutoExpandModes;
+begin
+  Result := FAutoExpand;
+  FAutoExpand := [aeData, aeNavigation];
+end;
+
+procedure TsCustomWorksheetGrid.RestoreAutoExpand(AValue: TsAutoExpandModes);
+begin
+  FAutoExpand := AValue;
+end;
+
 {@@ ----------------------------------------------------------------------------
   Removes the link of the WorksheetGrid to the WorkbookSource.
   Required before destruction.