diff --git a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
index bd93b24b5..73d7a7fd6 100644
--- a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
+++ b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
@@ -300,6 +300,7 @@ type
     function GetCellText(ACol, ARow: Integer; ATrim: Boolean = true): String;
     function GetEditText(ACol, ARow: Integer): String; override;
     function GetDefaultColumnTitle(Column: Integer): string; override;
+    function GetIsCellTitle(ACol, ARow: Integer): boolean; override;
     function HasBorder(ACell: PCell; ABorder: TsCellBorder): Boolean;
     procedure HeaderSizing(const IsColumn:boolean; const AIndex,ASize:Integer); override;
     procedure HeaderSized(IsColumn: Boolean; AIndex: Integer); override;
@@ -4150,6 +4151,15 @@ begin
   Result := Integer(ASheetRow) + FHeaderCount;
 end;
 
+{@@ ----------------------------------------------------------------------------
+  Inherited method. Is overridden to make sure that no column headers are
+  drawn when ShowHeaders is false.
+-------------------------------------------------------------------------------}
+function TsCustomWorksheetGrid.GetIsCellTitle(ACol, ARow: Integer): Boolean;
+begin
+  Result := (FHeaderCount > 0) and (ARow = 0);
+end;
+
 {@@ ----------------------------------------------------------------------------
   Returns a list of worksheets contained in the file. Useful for assigning to
   user controls like TabControl, Combobox etc. in order to select a sheet.