diff --git a/app/app.c b/app/app.c
index b2c747ac..4586ca14 100644
--- a/app/app.c
+++ b/app/app.c
@@ -1729,6 +1729,9 @@ void APP_TimeSlice500ms(void)
 							if (gFmRadioMode && gCurrentFunction != FUNCTION_RECEIVE && gCurrentFunction != FUNCTION_MONITOR && gCurrentFunction != FUNCTION_TRANSMIT)
 								GUI_SelectNextDisplay(DISPLAY_FM);
 							else
+						#endif
+						#ifdef ENABLE_NO_SCAN_TIMEOUT
+							if (gScreenToDisplay != DISPLAY_SCANNER)
 						#endif
 								GUI_SelectNextDisplay(DISPLAY_MAIN);
 					}
diff --git a/firmware.bin b/firmware.bin
index 900007be..cfd6c884 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index d04ad11d..b562fc78 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ