diff --git a/out/locale/en/LC_MESSAGES/default.po b/out/locale/en/LC_MESSAGES/default.po
index 7df6e90a..52982389 100644
--- a/out/locale/en/LC_MESSAGES/default.po
+++ b/out/locale/en/LC_MESSAGES/default.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HeidiSQL\n"
 "POT-Creation-Date: 2012-11-05 21:40\n"
-"PO-Revision-Date: 2025-05-22 20:05+0200\n"
+"PO-Revision-Date: 2025-05-22 21:39+0200\n"
 "Last-Translator: Ansgar Becker <anse@heidisql.com>\n"
 "Language-Team: English (http://www.transifex.com/projects/p/heidisql/language/en/)\n"
 "Language: en\n"
@@ -6763,8 +6763,8 @@ msgstr "Export cancelled, file not overwritten: %s"
 msgid "Discard changes?"
 msgstr "Discard changes?"
 
-msgid "Select top 1000 rows"
-msgstr "Select top 1000 rows"
+msgid "Select top %s rows"
+msgstr "Select top %s rows"
 
-msgid "Selects the first 1000 rows in a new query tab"
-msgstr "Selects the first 1000 rows in a new query tab"
+msgid "Selects the first %s rows in a new query tab"
+msgstr "Selects the first %s rows in a new query tab"
diff --git a/source/main.pas b/source/main.pas
index 0e537666..c15fcd7d 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -5086,7 +5086,7 @@ begin
 
   for Obj in Objects do begin
     Tab := GetOrCreateEmptyQueryTab(True);
-    Tab.Memo.Text := Conn.ApplyLimitClause('SELECT', '* FROM '+Obj.QuotedName, 1000, 0);
+    Tab.Memo.Text := Conn.ApplyLimitClause('SELECT', '* FROM '+Obj.QuotedName, AppSettings.ReadInt(asDatagridRowsPerStep), 0);
     actExecuteQueryExecute(Sender);
   end;
 end;
@@ -8014,6 +8014,9 @@ var
   Conn: TDBConnection;
 begin
   // DBtree and ListTables both use popupDB as menu
+  actQueryTable.Caption := f_('Select top %s rows', [FormatNumber(AppSettings.ReadInt(asDatagridRowsPerStep))]);
+  actQueryTable.Hint := f_('Selects the first %s rows in a new query tab', [FormatNumber(AppSettings.ReadInt(asDatagridRowsPerStep))]);
+
   if PopupComponent(Sender) = DBtree then begin
     Obj := DBTree.GetNodeData(DBTree.FocusedNode);
     IsDb := Obj.NodeType = lntDb;