diff --git a/app/app.c b/app/app.c
index e5cc76b..f522701 100644
--- a/app/app.c
+++ b/app/app.c
@@ -1276,6 +1276,7 @@ void APP_TimeSlice10ms(void)
 	APP_CheckKeys();
 }
 
+// this is called once every 500ms
 void APP_TimeSlice500ms(void)
 {
 	// Skipped authentic device check
@@ -1339,7 +1340,7 @@ void APP_TimeSlice500ms(void)
 					if (gScreenToDisplay != DISPLAY_SCANNER || gScanCssState >= SCAN_CSS_STATE_FOUND)
 				#endif
 				{
-					if (gEeprom.AUTO_KEYPAD_LOCK && gKeyLockCountdown && !gDTMF_InputMode)
+					if (gEeprom.AUTO_KEYPAD_LOCK && gKeyLockCountdown > 0 && !gDTMF_InputMode)
 					{
 						if (--gKeyLockCountdown == 0)
 							gEeprom.KEY_LOCK = true;
@@ -1588,7 +1589,7 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 	else
 	{
 		if (Key != KEY_PTT)
-			gVoltageMenuCountdown = 16;
+			gVoltageMenuCountdown = 2 * 30;	// 30 sec
 
 		BACKLIGHT_TurnOn();
 
diff --git a/firmware b/firmware
index 0f7ebba..c524c12 100644
Binary files a/firmware and b/firmware differ
diff --git a/firmware.bin b/firmware.bin
index 727ff15..a84ace6 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index 975a47d..ca0ada2 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ