diff --git a/firmware.bin b/firmware.bin
index d908578..d7de750 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index 920bfd9..139224c 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ
diff --git a/panadapter.c b/panadapter.c
index e45a057..d15f8ad 100644
--- a/panadapter.c
+++ b/panadapter.c
@@ -119,8 +119,9 @@ bool PAN_process_10ms(void)
 		if (++g_panadapter_rssi_index >= (int)ARRAY_SIZE(g_panadapter_rssi))
 			g_panadapter_rssi_index = 0;
 
-		// switch back to the VFO frequency once every 16 frequency steps
-		g_panadapter_vfo_mode = ((g_panadapter_rssi_index & 15u) == 0) ? 1 : 0;
+		// switch back to the VFO frequency once every 16 frequency steps .. if in FM mode
+		if (g_tx_vfo->channel.mod_mode == MOD_MODE_FM)
+			g_panadapter_vfo_mode = ((g_panadapter_rssi_index & 15u) == 0) ? 1 : 0;
 	}
 	else
 	if (++g_panadapter_vfo_mode >= 8)