diff --git a/src/gui/menu_model.cpp b/src/gui/menu_model.cpp
index 3953e5669..4c94c8726 100644
--- a/src/gui/menu_model.cpp
+++ b/src/gui/menu_model.cpp
@@ -762,7 +762,7 @@ void editName(uint8_t x, uint8_t y, char *name, uint8_t size, uint8_t event, uin
 
       if (p1valdiff || IS_ROTARY_RIGHT(event) || IS_ROTARY_LEFT(event) || event==EVT_KEY_FIRST(KEY_DOWN) || event==EVT_KEY_FIRST(KEY_UP)
           || event==EVT_KEY_REPT(KEY_DOWN) || event==EVT_KEY_REPT(KEY_UP)) {
-         v = checkIncDec(event, abs(v), 0, ZCHAR_MAX, 0);
+         v = checkIncDec(event, abs(v), 0, LEN_STD_CHARS, 0);
          if (c <= 0) v = -v;
       }
 
diff --git a/src/opentx.h b/src/opentx.h
index 3fc2ede34..3d7b8e2b5 100644
--- a/src/opentx.h
+++ b/src/opentx.h
@@ -727,7 +727,8 @@ extern uint8_t pxxFlag[NUM_MODULES];
 #define PXX_SEND_FAILSAFE    (1 << 4)
 #define PXX_SEND_RANGECHECK  (1 << 5)
 
-#define ZCHAR_MAX (40 + LEN_SPECIAL_CHARS)
+#define LEN_STD_CHARS 40
+#define ZCHAR_MAX (LEN_STD_CHARS + LEN_SPECIAL_CHARS)
 
 extern char idx2char(int8_t idx);