diff --git a/components/fpspreadsheet/examples/visual/fpsctrls/main.lfm b/components/fpspreadsheet/examples/visual/fpsctrls/main.lfm
index c9d5ce4d5..6b9350aca 100644
--- a/components/fpspreadsheet/examples/visual/fpsctrls/main.lfm
+++ b/components/fpspreadsheet/examples/visual/fpsctrls/main.lfm
@@ -27,6 +27,7 @@ object MainForm: TMainForm
       Height = 493
       Top = 23
       Width = 690
+      AutoExpand = [aeData, aeNavigation]
       FrozenCols = 0
       FrozenRows = 0
       ReadFormulas = True
diff --git a/components/fpspreadsheet/fpspreadsheetgrid.pas b/components/fpspreadsheet/fpspreadsheetgrid.pas
index 23126c942..b88204c3f 100644
--- a/components/fpspreadsheet/fpspreadsheetgrid.pas
+++ b/components/fpspreadsheet/fpspreadsheetgrid.pas
@@ -487,7 +487,7 @@ type
     {@@ Automatically recalculates the worksheet if a cell value changes. }
     property AutoCalc;
     {@@ Automatically expand grid dimensions }
-    property AutoExpand default [aeData];
+    property AutoExpand default [aeData, aeNavigation];
     {@@ Displays column and row headers in the fixed col/row style of the grid.
         Deprecated. Use ShowHeaders instead. }
     property DisplayFixedColRow; deprecated 'Use ShowHeaders';
@@ -987,7 +987,7 @@ begin
   FSelPen.Color := clBlack;
   FSelPen.JoinStyle := pjsMiter;
   FSelPen.OnChange := @SelPenChangeHandler;
-  FAutoExpand := [aeData];
+  FAutoExpand := [aeData, aeNavigation];
   FHyperlinkTimer := TTimer.Create(self);
   FHyperlinkTimer.Interval := HYPERLINK_TIMER_INTERVAL;
   FHyperlinkTimer.OnTimer := @HyperlinkTimerElapsed;
@@ -1084,7 +1084,7 @@ begin
     if (AMode in FAutoExpand) then
       ColCount := ACol + 1
     else
-      raise Exception.Create(rsOperationExceedsColCount);
+      raise Exception.CreateFmt(rsOperationExceedsColCount, [ACol, ColCount]);
   end;
 end;
 
@@ -1099,7 +1099,7 @@ begin
     if (AMode in FAutoExpand) then
       RowCount := ARow + 1
     else
-      raise Exception.Create(rsOperationExceedsRowCount);
+      raise Exception.CreateFmt(rsOperationExceedsRowCount, [ARow, RowCount]);
   end;
 end;
 
diff --git a/components/fpspreadsheet/fpsstrings.pas b/components/fpspreadsheet/fpsstrings.pas
index 4fedbd7aa..b8af0e555 100644
--- a/components/fpspreadsheet/fpsstrings.pas
+++ b/components/fpspreadsheet/fpsstrings.pas
@@ -168,8 +168,8 @@ resourcestring
   rsWorksheetNotFound1 = 'Worksheet not found.';
 
   // WorksheetGrid
-  rsOperationExceedsColCount = 'This operation exceeds the range of defined grid columns.';
-  rsOperationExceedsRowCount = 'This operation exceeds the range of defined grid rows.';
+  rsOperationExceedsColCount = 'This operation at index %d exceeds the range of defined grid columns (%d).';
+  rsOperationExceedsRowCount = 'This operation at index %d exceeds the range of defined grid rows (%d).';
 
   // Export
   rsExportFileIsRequired = 'Export file name is required.';
diff --git a/components/fpspreadsheet/languages/fpsstrings.de.po b/components/fpspreadsheet/languages/fpsstrings.de.po
index 48120d448..10efa1ba8 100644
--- a/components/fpspreadsheet/languages/fpsstrings.de.po
+++ b/components/fpspreadsheet/languages/fpsstrings.de.po
@@ -8,7 +8,7 @@ msgstr ""
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.8.9\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language: de\n"
 
@@ -297,12 +297,12 @@ msgid "Only one image per %s section allowed."
 msgstr "Nur ein Bild ist erlaubt pro %s Abschnitt."
 
 #: fpsstrings.rsoperationexceedscolcount
-msgid "This operation exceeds the range of defined grid columns."
-msgstr "Diese Operation überschreitet den Bereich der definierten Spalten."
+msgid "This operation at index %d exceeds the range of defined grid columns (%d)."
+msgstr "Diese Operation bei Index %d überschreitet den Bereich der definierten Spalten (%d)."
 
 #: fpsstrings.rsoperationexceedsrowcount
-msgid "This operation exceeds the range of defined grid rows."
-msgstr "Diese Operation überschreitet den Bereich der definierten Zeilen."
+msgid "This operation at index %d exceeds the range of defined grid rows (%d)."
+msgstr "Diese Operation bei Index %d überschreitet den Bereich der definierten Zeilen (%d)."
 
 #: fpsstrings.rspaletteindex
 msgid "Palette index %d"
diff --git a/components/fpspreadsheet/languages/fpsstrings.fi.po b/components/fpspreadsheet/languages/fpsstrings.fi.po
index 91e4f31cb..260beee41 100644
--- a/components/fpspreadsheet/languages/fpsstrings.fi.po
+++ b/components/fpspreadsheet/languages/fpsstrings.fi.po
@@ -286,11 +286,11 @@ msgid "Only one image per %s section allowed."
 msgstr ""
 
 #: fpsstrings.rsoperationexceedscolcount
-msgid "This operation exceeds the range of defined grid columns."
+msgid "This operation at index %d exceeds the range of defined grid columns (%d)."
 msgstr ""
 
 #: fpsstrings.rsoperationexceedsrowcount
-msgid "This operation exceeds the range of defined grid rows."
+msgid "This operation at index %d exceeds the range of defined grid rows (%d)."
 msgstr ""
 
 #: fpsstrings.rspaletteindex
diff --git a/components/fpspreadsheet/languages/fpsstrings.hu.po b/components/fpspreadsheet/languages/fpsstrings.hu.po
index aeaa42672..4399f4f65 100644
--- a/components/fpspreadsheet/languages/fpsstrings.hu.po
+++ b/components/fpspreadsheet/languages/fpsstrings.hu.po
@@ -296,11 +296,15 @@ msgid "Only one image per %s section allowed."
 msgstr "Csak egy kép lehet %s szakaszonként."
 
 #: fpsstrings.rsoperationexceedscolcount
-msgid "This operation exceeds the range of defined grid columns."
+#, fuzzy
+#| msgid "This operation exceeds the range of defined grid columns."
+msgid "This operation at index %d exceeds the range of defined grid columns (%d)."
 msgstr "A művelet túllépi a rács oszlopainak tartományát."
 
 #: fpsstrings.rsoperationexceedsrowcount
-msgid "This operation exceeds the range of defined grid rows."
+#, fuzzy
+#| msgid "This operation exceeds the range of defined grid rows."
+msgid "This operation at index %d exceeds the range of defined grid rows (%d)."
 msgstr "A művelet túllépi a rács sorainak tartományát."
 
 #: fpsstrings.rspaletteindex
diff --git a/components/fpspreadsheet/languages/fpsstrings.po b/components/fpspreadsheet/languages/fpsstrings.po
index 291755da3..c089e6154 100644
--- a/components/fpspreadsheet/languages/fpsstrings.po
+++ b/components/fpspreadsheet/languages/fpsstrings.po
@@ -286,11 +286,11 @@ msgid "Only one image per %s section allowed."
 msgstr ""
 
 #: fpsstrings.rsoperationexceedscolcount
-msgid "This operation exceeds the range of defined grid columns."
+msgid "This operation at index %d exceeds the range of defined grid columns (%d)."
 msgstr ""
 
 #: fpsstrings.rsoperationexceedsrowcount
-msgid "This operation exceeds the range of defined grid rows."
+msgid "This operation at index %d exceeds the range of defined grid rows (%d)."
 msgstr ""
 
 #: fpsstrings.rspaletteindex
diff --git a/components/fpspreadsheet/languages/fpsstrings.ru.po b/components/fpspreadsheet/languages/fpsstrings.ru.po
index 400b746f8..22f1b2f8d 100644
--- a/components/fpspreadsheet/languages/fpsstrings.ru.po
+++ b/components/fpspreadsheet/languages/fpsstrings.ru.po
@@ -286,11 +286,15 @@ msgid "Only one image per %s section allowed."
 msgstr "Разрешено только одно изображения для секции %s."
 
 #: fpsstrings.rsoperationexceedscolcount
-msgid "This operation exceeds the range of defined grid columns."
+#, fuzzy
+#| msgid "This operation exceeds the range of defined grid columns."
+msgid "This operation at index %d exceeds the range of defined grid columns (%d)."
 msgstr "Эта операция превышает диапазон определенных столбцов таблицы"
 
 #: fpsstrings.rsoperationexceedsrowcount
-msgid "This operation exceeds the range of defined grid rows."
+#, fuzzy
+#| msgid "This operation exceeds the range of defined grid rows."
+msgid "This operation at index %d exceeds the range of defined grid rows (%d)."
 msgstr "Эта операция превышает диапазон определенных столбцов таблицы"
 
 #: fpsstrings.rspaletteindex