diff --git a/radio/src/gui/9X/menu_model_setup.cpp b/radio/src/gui/9X/menu_model_setup.cpp
index 6ba0d9866..0b12529b3 100644
--- a/radio/src/gui/9X/menu_model_setup.cpp
+++ b/radio/src/gui/9X/menu_model_setup.cpp
@@ -168,8 +168,11 @@ void menuModelSetup(uint8_t event)
     uint8_t k = i+s_pgOfs;
 #if defined(CPUARM)
     for (int j=0; j<=k; j++) {
-      if (mstate_tab[j+1] == HIDDEN_ROW)
-        k++;
+      if (mstate_tab[j+1] == HIDDEN_ROW) {
+    	if (++k >= (int)DIM(mstate_tab)) {
+    	  return;
+    	}
+      }
     }
 #endif