diff --git a/ui/menu.c b/ui/menu.c
index bfa43c4..b5e426f 100644
--- a/ui/menu.c
+++ b/ui/menu.c
@@ -750,7 +750,10 @@ void UI_DisplayMenu(void)
 			{
 				const uint32_t frequency = SETTINGS_FetchChannelFrequency(gSubMenuSelection);
 
-				if (!gIsInSubMenu || edit_index < 0)
+				//if (!gIsInSubMenu || edit_index < 0)
+				if (!gIsInSubMenu)
+					edit_index = -1;
+				if (edit_index < 0)
 				{	// show the channel name
 					SETTINGS_FetchChannelName(String, gSubMenuSelection);
 					char *pPrintStr = String[0] ? String : "--";