diff --git a/src/game/game_gui.cpp b/src/game/game_gui.cpp
index ad2248a6f5..566a219b20 100644
--- a/src/game/game_gui.cpp
+++ b/src/game/game_gui.cpp
@@ -21,6 +21,7 @@
 #include "game_config.hpp"
 #include "game_info.hpp"
 #include "../script/script_gui.h"
+#include "../script_config.hpp"
 #include "../table/strings.h"
 
 #include "../safeguards.h"
@@ -340,7 +341,7 @@ struct GSConfigWindow : public Window {
 				} else if (!bool_item && !config_item.complete_labels) {
 					/* Display a query box so users can enter a custom value. */
 					SetDParam(0, old_val);
-					ShowQueryString(STR_JUST_INT, STR_CONFIG_SETTING_QUERY_CAPTION, 10, this, CS_NUMERAL, QSF_NONE);
+					ShowQueryString(STR_JUST_INT, STR_CONFIG_SETTING_QUERY_CAPTION, INT32_DIGITS_WITH_SIGN_AND_TERMINATION, this, CS_NUMERAL_SIGNED, QSF_NONE);
 				}
 				this->SetDirty();
 				break;
diff --git a/src/script/script_config.hpp b/src/script/script_config.hpp
index f8b2a43dc9..b243f3061f 100644
--- a/src/script/script_config.hpp
+++ b/src/script/script_config.hpp
@@ -18,6 +18,9 @@
 #include "../textfile_gui.h"
 #include "script_instance.hpp"
 
+/** Maximum of 10 digits for MIN / MAX_INT32, 1 for the sign and 1 for '\0'. */
+static const int INT32_DIGITS_WITH_SIGN_AND_TERMINATION = 10 + 1 + 1;
+
 /** Bitmask of flags for Script settings. */
 enum ScriptConfigFlags {
 	SCRIPTCONFIG_NONE      = 0x0, ///< No flags set.
diff --git a/src/script/script_gui.cpp b/src/script/script_gui.cpp
index 468cdecf59..8c9a1abcc7 100644
--- a/src/script/script_gui.cpp
+++ b/src/script/script_gui.cpp
@@ -25,6 +25,7 @@
 #include "script_gui.h"
 #include "script_log.hpp"
 #include "script_scanner.hpp"
+#include "script_config.hpp"
 #include "../ai/ai.hpp"
 #include "../ai/ai_config.hpp"
 #include "../ai/ai_info.hpp"
@@ -497,7 +498,7 @@ struct ScriptSettingsWindow : public Window {
 				} else if (!bool_item && !config_item.complete_labels) {
 					/* Display a query box so users can enter a custom value. */
 					SetDParam(0, old_val);
-					ShowQueryString(STR_JUST_INT, STR_CONFIG_SETTING_QUERY_CAPTION, 10, this, CS_NUMERAL, QSF_NONE);
+					ShowQueryString(STR_JUST_INT, STR_CONFIG_SETTING_QUERY_CAPTION, INT32_DIGITS_WITH_SIGN_AND_TERMINATION, this, CS_NUMERAL_SIGNED, QSF_NONE);
 				}
 				this->SetDirty();
 				break;