diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp
index 80e4f3256c..b01b5a1bf0 100644
--- a/src/openrct2/interface/Window.cpp
+++ b/src/openrct2/interface/Window.cpp
@@ -194,7 +194,7 @@ static void WindowCloseSurplus(int32_t cap, WindowClass avoid_classification)
 void WindowSetWindowLimit(int32_t value)
 {
     int32_t prev = gConfigGeneral.WindowLimit;
-    int32_t val = std::clamp(value, WINDOW_LIMIT_MIN, WINDOW_LIMIT_MAX);
+    int32_t val = std::clamp<int32_t>(value, kWindowLimitMin, WINDOW_LIMIT_MAX);
     gConfigGeneral.WindowLimit = val;
     ConfigSaveDefault();
     // Checks if value decreases and then closes surplus
diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h
index 814a6600e8..1e3b50c76f 100644
--- a/src/openrct2/interface/Window.h
+++ b/src/openrct2/interface/Window.h
@@ -482,7 +482,7 @@ enum class Tool
 using modal_callback = void (*)(int32_t result);
 using close_callback = void (*)();
 
-#define WINDOW_LIMIT_MIN 4
+constexpr int8_t kWindowLimitMin = 4;
 #define WINDOW_LIMIT_MAX 64
 #define WINDOW_LIMIT_RESERVED 4 // Used to reserve room for the main viewport, toolbars, etc.