diff --git a/openrtx/src/ui/ui_menu.c b/openrtx/src/ui/ui_menu.c
index d4407df5..34697aee 100644
--- a/openrtx/src/ui/ui_menu.c
+++ b/openrtx/src/ui/ui_menu.c
@@ -34,8 +34,8 @@
 /* UI main screen helper functions, their implementation is in "ui_main.c" */
 extern void _ui_drawMainBottom();
 
-static char priorSelectedMenuName[21] = "\0";
-static char priorSelectedMenuValue[21] = "\0";
+static char priorSelectedMenuName[MAX_ENTRY_LEN] = "\0";
+static char priorSelectedMenuValue[MAX_ENTRY_LEN] = "\0";
 
 const char *display_timer_values[] =
 {
@@ -70,6 +70,8 @@ bool DidSelectedMenuItemChange(char* menuName, char* menuValue)
 		strcpy(priorSelectedMenuName, menuName);
 		if (menuValue)
 			strcpy(priorSelectedMenuValue, menuValue);
+		else
+			*priorSelectedMenuValue = '\0'; // reset it since we've changed menu item.
 
 		return true;
 	}