diff --git a/README.md b/README.md
index 079c701..b74f076 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,7 @@ ENABLE_AUDIO_BAR              := 0       experimental, display an audo bar level
 * Finer RSSI bar steps
 * Mic menu includes max gain possible
 * AM RX everywhere
+* keypad-5/NOAA button now toggles scanlist-1 on/off for current channel when held down - IF NOAA is not used
 * Better backlight times (inc always on)
 * Nicer/cleaner big numeric font than original Quansheng big numeric font
 * Live DTMF decoder option, though the decoder needs some coeff tuning changes to decode other radios it seems
diff --git a/app/main.c b/app/main.c
index e61e832..c496a77 100644
--- a/app/main.c
+++ b/app/main.c
@@ -204,10 +204,13 @@ static void processFKeyFunction(const KEY_Code_t Key, const bool beep)
 					gRequestDisplayScreen = gScreenToDisplay;
 				#else
 					// toggle scanlist-1
-					gTxVfo->SCANLIST1_PARTICIPATION = gTxVfo->SCANLIST1_PARTICIPATION ? 0 : 1;
-					SETTINGS_UpdateChannel(gTxVfo->CHANNEL_SAVE, gTxVfo, true);
-					gVfoConfigureMode = VFO_CONFIGURE_1;
-					gFlagResetVfos    = true;
+					if (gScreenToDisplay != DISPLAY_SCANNER)
+					{
+						gTxVfo->SCANLIST1_PARTICIPATION = gTxVfo->SCANLIST1_PARTICIPATION ? 0 : 1;
+						SETTINGS_UpdateChannel(gTxVfo->CHANNEL_SAVE, gTxVfo, true);
+						gVfoConfigureMode = VFO_CONFIGURE_1;
+						gFlagResetVfos    = true;
+					}
 				#endif
 			#endif
 			break;
diff --git a/firmware b/firmware
index 0134bc4..0b6edca 100644
Binary files a/firmware and b/firmware differ
diff --git a/firmware.bin b/firmware.bin
index 120a29c..67337c0 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index 4f9b4ba..e77e679 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ