diff --git a/app/menu.c b/app/menu.c
index aa8e697..6f259f6 100644
--- a/app/menu.c
+++ b/app/menu.c
@@ -139,7 +139,8 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)
 
 		case MENU_TDR:
 			*pMin = 0;
-			*pMax = ARRAY_SIZE(gSubMenu_CHAN) - 1;
+//			*pMax = ARRAY_SIZE(gSubMenu_TDR) - 1;
+			*pMax = ARRAY_SIZE(gSubMenu_OFF_ON) - 1;
 			break;
 
 		case MENU_XB:
@@ -533,7 +534,9 @@ void MENU_AcceptSetting(void)
 			break;
 
 		case MENU_TDR:
-			gEeprom.DUAL_WATCH   = gSubMenuSelection;
+//			gEeprom.DUAL_WATCH   = gSubMenuSelection;
+			gEeprom.DUAL_WATCH   = (gSubMenuSelection > 0) ? 1 + gEeprom.TX_VFO : DUAL_WATCH_OFF;
+
 			gFlagReconfigureVfos = true;
 			gUpdateStatus        = true;
 			break;
@@ -980,7 +983,8 @@ void MENU_ShowCurrentSetting(void)
 			break;
 
 		case MENU_TDR:
-			gSubMenuSelection = gEeprom.DUAL_WATCH;
+//			gSubMenuSelection = gEeprom.DUAL_WATCH;
+			gSubMenuSelection = (gEeprom.DUAL_WATCH == DUAL_WATCH_OFF) ? 0 : 1;
 			break;
 
 		case MENU_XB:
diff --git a/firmware.bin b/firmware.bin
index c202907..18c2c84 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index 37ef3e6..a924ba6 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ
diff --git a/ui/menu.c b/ui/menu.c
index b8f03c2..89087a8 100644
--- a/ui/menu.c
+++ b/ui/menu.c
@@ -194,11 +194,11 @@ const char gSubMenu_TOT[11][7] =
 	"15 min"
 };
 
-const char gSubMenu_CHAN[3][10] =
+const char gSubMenu_TDR[3][10] =
 {
 	"OFF",
+	"LOWER\nVFO",
 	"UPPER\nVFO",
-	"LOWER\nVFO"
 };
 
 const char gSubMenu_XB[3][10] =
@@ -751,7 +751,8 @@ void UI_DisplayMenu(void)
 			break;
 
 		case MENU_TDR:
-			strcpy(String, gSubMenu_CHAN[gSubMenuSelection]);
+//			strcpy(String, gSubMenu_TDR[gSubMenuSelection]);
+			strcpy(String, gSubMenu_OFF_ON[gSubMenuSelection]);
 			break;
 
 		case MENU_XB:
diff --git a/ui/menu.h b/ui/menu.h
index 291eaa0..8325b78 100644
--- a/ui/menu.h
+++ b/ui/menu.h
@@ -148,7 +148,7 @@ extern const char         gSubMenu_W_N[2][7];
 extern const char         gSubMenu_OFF_ON[2][4];
 extern const char         gSubMenu_SAVE[5][4];
 extern const char         gSubMenu_TOT[11][7];
-extern const char         gSubMenu_CHAN[3][10];
+extern const char         gSubMenu_TDR[3][10];
 extern const char         gSubMenu_XB[3][10];
 #ifdef ENABLE_VOICE       
 	extern const char     gSubMenu_VOICE[3][4];