diff --git a/components/heidisql/include/const.inc b/components/heidisql/include/const.inc
index c30552a5..5d266eaa 100644
--- a/components/heidisql/include/const.inc
+++ b/components/heidisql/include/const.inc
@@ -52,6 +52,10 @@ const
   DEFAULT_DATAFONTNAME = 'Tahoma';
   REGNAME_DATAFONTSIZE = 'DataFontSize';
   DEFAULT_DATAFONTSIZE = 8;
+  REGNAME_DATALIMITSTART = 'DataLimitStart';
+  DEFAULT_DATALIMITSTART = 0;
+  REGNAME_DATALIMITEND = 'DataLimitEnd';
+  DEFAULT_DATALIMITEND = 5000;
   REGNAME_LOGSQLNUM = 'logsqlnum';
   DEFAULT_LOGSQLNUM = 300;
   REGNAME_LOGSQLWIDTH = 'logsqlwidth';
diff --git a/source/main.pas b/source/main.pas
index 554dcd57..d81e9c00 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -489,6 +489,9 @@ begin
       WriteInteger(REGNAME_TOOLBARQUERYLEFT, ToolBarQuery.Left);
       WriteInteger(REGNAME_TOOLBARQUERYTOP, ToolBarQuery.Top);
 
+      WriteInteger(REGNAME_DATALIMITSTART, UpdownLimitStart.Position);
+      WriteInteger(REGNAME_DATALIMITEND, UpdownLimitEnd.Position);
+
       // Save delimiter
       WriteString( REGNAME_DELIMITER, Delimiter );
     end;
@@ -563,6 +566,9 @@ begin
   ToolBarQuery.Left := GetRegValue(REGNAME_TOOLBARQUERYLEFT, ToolBarQuery.Left);
   ToolBarQuery.Top := GetRegValue(REGNAME_TOOLBARQUERYTOP, ToolBarQuery.Top);
 
+  UpdownLimitStart.Position := GetRegValue(REGNAME_DATALIMITSTART, DEFAULT_DATALIMITSTART);
+  UpdownLimitEnd.Position := GetRegValue(REGNAME_DATALIMITEND, DEFAULT_DATALIMITEND);
+
   // Delimiter
   Delimiter := GetRegValue(REGNAME_DELIMITER, DEFAULT_DELIMITER);