diff --git a/components/fpspreadsheet/fpspreadsheetgrid.pas b/components/fpspreadsheet/fpspreadsheetgrid.pas
index 3b9d1f3c9..92a7e09c3 100644
--- a/components/fpspreadsheet/fpspreadsheetgrid.pas
+++ b/components/fpspreadsheet/fpspreadsheetgrid.pas
@@ -4068,6 +4068,9 @@ begin
       gcol := GetGridCol(cell^.Col);
       AutoExpandToRow(grow, aeData);
       AutoExpandToCol(gcol, aeData);
+      lRow := Worksheet.FindRow(srow);
+      if (lRow = nil) or (lRow^.RowHeightType <> rhtCustom) then
+        UpdateRowHeight(grow, true);
     end;
     Invalidate;
   end;