diff --git a/app/main.c b/app/main.c
index dae4138..1bbb2d7 100644
--- a/app/main.c
+++ b/app/main.c
@@ -360,6 +360,14 @@ void processFKeyFunction(const key_code_t Key)
 
 		case KEY_5:    // NOAA
 
+			#ifdef ENABLE_PANADAPTER
+				if (g_fkey_pressed)
+				{
+					g_eeprom.config.setting.panadapter = (g_eeprom.config.setting.panadapter + 1) & 1u;
+					break;
+				}
+			#endif
+
 			#ifdef ENABLE_NOAA
 
 				APP_stop_scan();
diff --git a/firmware.bin b/firmware.bin
index 72cad6b..5c6a4a8 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index d966a0f..79ccc08 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ
diff --git a/panadapter.c b/panadapter.c
index ac4f2a6..42ed750 100644
--- a/panadapter.c
+++ b/panadapter.c
@@ -135,8 +135,8 @@ void PAN_process_10ms(void)
 			panadapter_rssi_index = 0;
 
 		if (g_tx_vfo->channel.mod_mode == MOD_MODE_FM)
-		{	// switch back to the VFO frequency for 100ms once every 500ms
-			g_panadapter_vfo_mode = ((panadapter_rssi_index % 50) == 0) ? 10 : 0;
+		{	// switch back to the VFO frequency for 100ms once every 400ms
+			g_panadapter_vfo_mode = ((panadapter_rssi_index % 40) == 0) ? 10 : 0;
 		}
 		else
 		{	// switch back to the VFO frequency for 100ms once each scan cycle