diff --git a/Makefile b/Makefile
index 7fb3ad3..7c4006c 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,7 @@ ENABLE_SIDE_BUTT_MENU            := 0
 # Key Lock 400 B
 ENABLE_KEYLOCK                   := 0
 ENABLE_PANADAPTER                := 1
-ENABLE_PANADAPTER_PEAK_FREQ      := 0
+ENABLE_PANADAPTER_PEAK_FREQ      := 1
 #ENABLE_SINGLE_VFO_CHAN          := 0
 
 #############################################################
diff --git a/firmware.bin b/firmware.bin
index 508712f..6e49d5d 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index 56ffc61..5a4c82a 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ
diff --git a/panadapter.c b/panadapter.c
index cc2a9d2..ecfc4ee 100644
--- a/panadapter.c
+++ b/panadapter.c
@@ -180,7 +180,7 @@ void PAN_process_10ms(void)
 			for (i = 0; i < (int)ARRAY_SIZE(g_panadapter_rssi); i++)
 			{
 				const uint8_t rssi = g_panadapter_rssi[i];
-				if (peak_rssi < rssi && rssi >= threshold_rssi && i != PANADAPTER_BINS)
+				if (peak_rssi < rssi && rssi >= threshold_rssi && (i < (PANADAPTER_BINS - 1) || i > (PANADAPTER_BINS + 1)))
 				{
 					peak_rssi = rssi;
 					g_panadapter_peak_freq = center_freq + (step_size * (i - PANADAPTER_BINS));