diff --git a/src/menus.cpp b/src/menus.cpp
index d53b20a88..7e16fa6e5 100644
--- a/src/menus.cpp
+++ b/src/menus.cpp
@@ -476,6 +476,9 @@ uint8_t m_posHorz;
 void popMenu()
 {
   if (g_menuStackPtr>0) {
+#ifdef DSM2
+    s_rangecheck_mode = 0;
+#endif
     g_menuStackPtr = g_menuStackPtr-1;
     AUDIO_KEYPAD_UP();
     m_posHorz = 0;
diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index 7186cb679..6e240f3ca 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -797,10 +797,7 @@ void menuProcModel(uint8_t event)
 
           if (IS_DSM2_PROTOCOL(protocol)) { // RANGE CHECK
             lcd_putsnAtt(MODEL_PARAM_OFS+4*FW, y, PSTR(" RANGE<range")+6*(s_rangecheck_mode), 6, (m_posHorz==1 ? attr : 0));
-            if (attr && m_posHorz==1 && s_editMode>0)
-              s_rangecheck_mode = true;
-            else
-              s_rangecheck_mode = false;
+            s_rangecheck_mode = (attr && m_posHorz==1 && s_editMode>0); // [MENU] key toggles range check mode
           }
 
           if (attr && (m_posHorz==0 && (s_editMode>0 || p1valdiff)))