diff --git a/radio/src/gui/Taranis/navigation.cpp b/radio/src/gui/Taranis/navigation.cpp
index ac258cd21..25a7f7023 100755
--- a/radio/src/gui/Taranis/navigation.cpp
+++ b/radio/src/gui/Taranis/navigation.cpp
@@ -545,7 +545,7 @@ void check(const char *name, check_event_t event, uint8_t curr, const MenuFuncP
     if (horTab) {
       linesCount = 0;
       for (int i=0; i<rowcount; i++) {
-        if (horTab[i] != HIDDEN_ROW) {
+        if (i>=horTabMax || horTab[i] != HIDDEN_ROW) {
           linesCount++;
         }
       }
@@ -566,7 +566,7 @@ void check(const char *name, check_event_t event, uint8_t curr, const MenuFuncP
         else {
           vertpos_t lastLine = firstLine;
           for (int numLines=0; lastLine<rowcount && numLines<NUM_BODY_LINES; lastLine++) {
-            if (horTab[lastLine] != HIDDEN_ROW) {
+            if (lastLine>=horTabMax || horTab[lastLine] != HIDDEN_ROW) {
               numLines++;
             }
           }
@@ -576,7 +576,7 @@ void check(const char *name, check_event_t event, uint8_t curr, const MenuFuncP
           else {
             linesCount = s_pgOfs + NUM_BODY_LINES;
             for (int i=lastLine; i<rowcount; i++) {
-              if (horTab[i] != HIDDEN_ROW) {
+              if (i>=horTabMax || horTab[i] != HIDDEN_ROW) {
                 linesCount++;
               }
             }