diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp
index 527f147a0..1b812eee7 100644
--- a/radio/src/gui/menu_model.cpp
+++ b/radio/src/gui/menu_model.cpp
@@ -4085,15 +4085,22 @@ void onGVARSMenu(const char *result)
   }
 }
 
+#define GVARS_FM_COLUMN(p) (12*FW + FWNUM + (p)*(2+3*FWNUM) - 3)
+
 void menuModelGVars(uint8_t event)
 {
   tmr10ms_t tmr10ms = get_tmr10ms();
   const char * menuTitle;
 
-  if (tmr10ms - menuEntryTime > 200/*2 seconds*/)
+  if (tmr10ms - menuEntryTime > 200/*2 seconds*/) {
     menuTitle = "GLOBAL V."; // TODO translate
-  else
+    for (int i=0; i<MAX_GVARS; i++) {
+      putsStrIdx(GVARS_FM_COLUMN(i)-16, 1, STR_FP, i, SMLSIZE|(getFlightPhase()==i ? INVERS : 0));
+    }
+  }
+  else {
     menuTitle = STR_MENUGLOBALVARS;
+  }
 
   MENU(menuTitle, menuTabModel, e_GVars, 1+MAX_GVARS, {0, NAVIGATION_LINE_BY_LINE|MAX_PHASES, NAVIGATION_LINE_BY_LINE|MAX_PHASES, NAVIGATION_LINE_BY_LINE|MAX_PHASES, NAVIGATION_LINE_BY_LINE|MAX_PHASES, NAVIGATION_LINE_BY_LINE|MAX_PHASES, NAVIGATION_LINE_BY_LINE|MAX_PHASES, NAVIGATION_LINE_BY_LINE|MAX_PHASES, NAVIGATION_LINE_BY_LINE|MAX_PHASES, NAVIGATION_LINE_BY_LINE|MAX_PHASES});
 
@@ -4116,7 +4123,7 @@ void menuModelGVars(uint8_t event)
 
     for (uint8_t j=0; j<1+MAX_PHASES; j++) {
       LcdFlags attr = ((sub==i && m_posHorz==j) ? ((s_editMode>0) ? BLINK|INVERS : INVERS) : 0);
-      xcoord_t x = 12*FW + FWNUM + (j-1)*(2+3*FWNUM) - 3;
+      xcoord_t x = GVARS_FM_COLUMN(j-1);
 
 #if MAX_GVARS == 6
       if (i==0 && j!=9) putsStrIdx(x+2, FH+1, STR_FP, j, SMLSIZE);