diff --git a/app/app.c b/app/app.c
index 7da0bc6..f38feab 100644
--- a/app/app.c
+++ b/app/app.c
@@ -1418,7 +1418,7 @@ void APP_TimeSlice500ms(void)
 			UI_UpdateRSSI(gCurrentRSSI);
 		}
 
-		if ((gFM_ScanState == FM_SCAN_OFF || gAskToSave) && gScanState == SCAN_OFF && gCssScanMode == CSS_SCAN_MODE_OFF)
+		if ((gFM_ScanState == FM_SCAN_OFF || gAskToSave) && gCssScanMode == CSS_SCAN_MODE_OFF)
 		{
 
 			if (gBacklightCountdown > 0)
@@ -1427,9 +1427,9 @@ void APP_TimeSlice500ms(void)
 						GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT);   // turn backlight off
 
 			#ifndef DISABLE_AIRCOPY
-				if (gScreenToDisplay != DISPLAY_AIRCOPY && (gScreenToDisplay != DISPLAY_SCANNER || gScanCssState >= SCAN_CSS_STATE_FOUND))
+				if (gScanState == SCAN_OFF && gScreenToDisplay != DISPLAY_AIRCOPY && (gScreenToDisplay != DISPLAY_SCANNER || gScanCssState >= SCAN_CSS_STATE_FOUND))
 			#else
-				if (gScreenToDisplay != DISPLAY_SCANNER || gScanCssState >= SCAN_CSS_STATE_FOUND)
+				if (gScanState == SCAN_OFF && (gScreenToDisplay != DISPLAY_SCANNER || gScanCssState >= SCAN_CSS_STATE_FOUND))
 			#endif
 			{
 				if (gEeprom.AUTO_KEYPAD_LOCK && gKeyLockCountdown > 0 && !gDTMF_InputMode)
diff --git a/firmware b/firmware
index 1f0949c..db86f3d 100644
Binary files a/firmware and b/firmware differ
diff --git a/firmware.bin b/firmware.bin
index c8a1d20..e308153 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index c27b87d..7273796 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ
diff --git a/misc.c b/misc.c
index 8815951..5a53cfd 100644
--- a/misc.c
+++ b/misc.c
@@ -23,7 +23,7 @@ const uint8_t     g_scan_delay = 21;   // 210ms
 
 const uint8_t     g_menu_timeout = 2 * 30;  // 30 seconds
 
-const uint16_t    gMax_bat_v = 840;   // 8.4V
+const uint16_t    gMax_bat_v = 843;   // 8.43V
 const uint16_t    gMin_bat_v = 660;   // 6.6V
 
 const uint32_t    gDefaultAesKey[4] = {0x4AA5CC60, 0x0312CC5F, 0xFFD2DABB, 0x6BBA7F92};