diff --git a/main.c b/main.c
index efded8d..287ad74 100644
--- a/main.c
+++ b/main.c
@@ -123,6 +123,7 @@ void Main(void)
 
 	if (BootMode == BOOT_MODE_F_LOCK)
 	{
+
 		gF_LOCK = true;            // flag to say include the hidden menu items
 		#ifdef ENABLE_FEAT_F4HWN
 			gEeprom.KEY_LOCK = 0;
@@ -132,6 +133,7 @@ void Main(void)
 			#else
 				gMenuCursor = 64; // move to hidden section, fix me if change... !!!
 			#endif
+			gSubMenuSelection = gSetting_F_LOCK;
 		#endif
 	}
 
diff --git a/ui/menu.c b/ui/menu.c
index 4e2575f..9175197 100644
--- a/ui/menu.c
+++ b/ui/menu.c
@@ -920,7 +920,11 @@ void UI_DisplayMenu(void)
 			break;
 
 		case MENU_F_LOCK:
+#ifdef ENABLE_FEAT_F4HWN
+			if(!gIsInSubMenu && gUnlockAllTxConfCnt>0 && gUnlockAllTxConfCnt<3)
+#else
 			if(!gIsInSubMenu && gUnlockAllTxConfCnt>0 && gUnlockAllTxConfCnt<10)
+#endif
 				strcpy(String, "READ\nMANUAL");
 			else
 				strcpy(String, gSubMenu_F_LOCK[gSubMenuSelection]);