diff --git a/src/menu_model.cpp b/src/menu_model.cpp
index 4c065197d..c9d8a5145 100644
--- a/src/menu_model.cpp
+++ b/src/menu_model.cpp
@@ -894,8 +894,9 @@ void menuModelSetup(uint8_t event)
   #define IF_PORT2_ON(x)             (g_model.externalModule == MODULE_TYPE_NONE ? (uint8_t)-1 : (uint8_t)(x))
   #define IF_PORT_ON(idx, x)         (idx==0 ? IS_PORT1_ON(x) : IS_PORT2_ON(x))
   #define IF_PORT2_XJT(x)            (IS_MODULE_XJT(1) ? (uint8_t)x : (uint8_t)-1)
-  #define PORT2_CHANNELS_ROWS()      (g_model.externalModule == MODULE_TYPE_NONE ? (uint8_t)-1 : (g_model.externalModule == MODULE_TYPE_DJT ? (uint8_t)0 : (g_model.externalModule == MODULE_TYPE_DSM2 ? (uint8_t)0 : ((uint8_t)1))))
-  #define PORT_CHANNELS_ROWS(x)      (x==0 ? (uint8_t)1 : (uint8_t)PORT2_CHANNELS_ROWS())
+  #define PORT1_CHANNELS_ROWS()      IF_PORT1_ON(1)
+  #define PORT2_CHANNELS_ROWS()      IF_PORT2_ON(g_model.externalModule == MODULE_TYPE_DJT ? (uint8_t)0 : (g_model.externalModule == MODULE_TYPE_DSM2 ? (uint8_t)0 : ((uint8_t)1)))
+  #define PORT_CHANNELS_ROWS(x)      (x==0 ? PORT1_CHANNELS_ROWS() : PORT2_CHANNELS_ROWS())
   MENU(STR_MENUSETUP, menuTabModel, e_ModelSetup, 1+ITEM_MODEL_SETUP_MAX, { 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, NAVIGATION_LINE_BY_LINE|(NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1), LABEL(InternalModule), 0, IF_PORT1_ON(1), IF_PORT1_ON(2), IF_PORT1_ON(g_model.moduleData[0].failsafeMode==FAILSAFE_CUSTOM ? (uint8_t)1 : (uint8_t)0), LABEL(ExternalModule), g_model.externalModule==MODULE_TYPE_XJT ? (uint8_t)1 : (uint8_t)0, PORT2_CHANNELS_ROWS(), (IS_MODULE_PPM(1) || IS_MODULE_XJT(1) ? (uint8_t)2 : (uint8_t)-1), IF_PORT2_XJT(g_model.moduleData[1].failsafeMode==FAILSAFE_CUSTOM ? (uint8_t)1 : (uint8_t)0), 0});
 #elif defined(CPUM64)
   #define CURSOR_ON_CELL (true)