diff --git a/radio/src/gui/128x64/gui.h b/radio/src/gui/128x64/gui.h
index 397e7fcdb..da65a514c 100644
--- a/radio/src/gui/128x64/gui.h
+++ b/radio/src/gui/128x64/gui.h
@@ -72,13 +72,14 @@ extern int8_t s_editMode;       // global editmode
 #define INCDEC_REP10                   0x40
 #define NO_DBLKEYS                     0x80
 
-  #define INCDEC_DECLARE_VARS(f)       uint8_t incdecFlag = (f); IsValueAvailable isValueAvailable = NULL
-  #define INCDEC_SET_FLAG(f)           incdecFlag = (f)
-  #define INCDEC_ENABLE_CHECK(fn)      isValueAvailable = fn
-  #define CHECK_INCDEC_PARAM(event, var, min, max) checkIncDec(event, var, min, max, incdecFlag, isValueAvailable)
+#define INCDEC_DECLARE_VARS(f)       uint8_t incdecFlag = (f); IsValueAvailable isValueAvailable = NULL
+#define INCDEC_SET_FLAG(f)           incdecFlag = (f)
+#define INCDEC_ENABLE_CHECK(fn)      isValueAvailable = fn
+#define CHECK_INCDEC_PARAM(event, var, min, max) checkIncDec(event, var, min, max, incdecFlag, isValueAvailable)
 
 // mawrow special values
-#define TITLE_ROW      ((uint8_t)-1)
+#define READONLY_ROW   ((uint8_t)-1)
+#define TITLE_ROW      READONLY_ROW
 #define HIDDEN_ROW     ((uint8_t)-2)
 
 struct CheckIncDecStops {
diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index c68efbc71..90fd60553 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -308,7 +308,6 @@ void runPopupRegister(event_t event)
     lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 2 + FH, "Rx Name");
     editName(WARNING_LINE_X + 8*FW, WARNING_LINE_Y - 2 + FH, reusableBuffer.modelSetup.pxx2.registerRxName, PXX2_LEN_RX_NAME, event, menuVerticalPosition == 1);
 
-    // lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH + 2, STR_POPUPS_ENTER_EXIT);
     lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH + 2, TR_ENTER, menuVerticalPosition == 2 && menuHorizontalPosition == 0 ? INVERS : 0);
     lcdDrawText(WARNING_LINE_X + 8*FW, WARNING_LINE_Y+2*FH + 2, TR_EXIT, menuVerticalPosition == 2 && menuHorizontalPosition == 1 ? INVERS : 0);
 
@@ -323,6 +322,11 @@ void runPopupRegister(event_t event)
   s_editMode = (moduleSettings[INTERNAL_MODULE].mode == MODULE_MODE_REGISTER ? EDIT_MODIFY_FIELD : 0);
 }
 
+inline bool isDefaultModelRegistrationID()
+{
+  return memcmp(g_model.modelRegistrationID, g_eeGeneral.ownerRegistrationID, PXX2_LEN_REGISTRATION_ID) == 0;
+}
+
 void menuModelSetup(event_t event)
 {
 #if defined(EXTERNAL_ANTENNA)
@@ -358,7 +362,7 @@ void menuModelSetup(event_t event)
 
     NUM_STICKS + NUM_POTS + NUM_SLIDERS + NUM_ROTARY_ENCODERS - 1, // Center beeps
     0, // Global functions
-    IF_PXX2(memcmp(g_model.modelRegistrationID, g_eeGeneral.ownerRegistrationID, PXX2_LEN_REGISTRATION_ID ) ? (uint8_t)-1: HIDDEN_ROW), // Registration ID
+    IF_PXX2(isDefaultModelRegistrationID() ? HIDDEN_ROW : READONLY_ROW), // Registration ID
 
     LABEL(InternalModule),
       INTERNAL_MODULE_MODE_ROWS, // module mode (PXX(2) / None)
@@ -1121,6 +1125,7 @@ void menuModelSetup(event_t event)
           if (moduleSettings[INTERNAL_MODULE].mode == MODULE_MODE_NORMAL && s_editMode > 0) {
             if (menuHorizontalPosition == 1) {
               reusableBuffer.modelSetup.pxx2.registerPopupVerticalPosition = 0;
+              reusableBuffer.modelSetup.pxx2.registerPopupHorizontalPosition = 0;
               reusableBuffer.modelSetup.pxx2.registerPopupEditMode = 0;
               s_editMode = 0;
               POPUP_INPUT("", runPopupRegister);
diff --git a/radio/src/gui/212x64/gui.h b/radio/src/gui/212x64/gui.h
index 7b217a708..50286021d 100644
--- a/radio/src/gui/212x64/gui.h
+++ b/radio/src/gui/212x64/gui.h
@@ -107,7 +107,8 @@ extern int8_t s_editMode; // global editmode
 #define CHECK_INCDEC_PARAM(event, var, min, max) checkIncDec(event, var, min, max, incdecFlag, isValueAvailable)
 
 // mawrow special values
-#define TITLE_ROW                      ((uint8_t)-1)
+#define READONLY_ROW                   ((uint8_t)-1)
+#define TITLE_ROW                      READONLY_ROW
 #define HIDDEN_ROW                     ((uint8_t)-2)
 
 struct CheckIncDecStops
diff --git a/radio/src/gui/480x272/menus.h b/radio/src/gui/480x272/menus.h
index 753c34a24..0c13c92fd 100644
--- a/radio/src/gui/480x272/menus.h
+++ b/radio/src/gui/480x272/menus.h
@@ -274,7 +274,8 @@ extern int8_t s_editMode;       // global editmode
 #define NO_DBLKEYS                     0x80
 
 // mawrow special values
-#define TITLE_ROW                      ((uint8_t)-1)
+#define READONLY_ROW                   ((uint8_t)-1)
+#define TITLE_ROW                      READONLY_ROW
 #define ORPHAN_ROW                     ((uint8_t)-2)
 #define HIDDEN_ROW                     ((uint8_t)-3)
 #define NAVIGATION_LINE_BY_LINE        0x40