diff --git a/Makefile b/Makefile
index cbeea32..2fc36db 100644
--- a/Makefile
+++ b/Makefile
@@ -84,10 +84,10 @@ ENABLE_TX_AUDIO_BAR              := 0
 ENABLE_SIDE_BUTT_MENU            := 0
 # Key Lock 400 B
 ENABLE_KEYLOCK                   := 0
-ENABLE_PANADAPTER                := 1
+ENABLE_PANADAPTER                := 0
 ENABLE_PANADAPTER_PEAK_FREQ      := 0
 # single VFO 1.4 kB
-ENABLE_SINGLE_VFO_CHAN           := 0
+ENABLE_SINGLE_VFO_CHAN           := 1
 
 #############################################################
 
diff --git a/firmware.bin b/firmware.bin
index 41beee0..35da622 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index 445693d..3d5e916 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ
diff --git a/ui/main.c b/ui/main.c
index 84b714c..133a406 100644
--- a/ui/main.c
+++ b/ui/main.c
@@ -863,7 +863,9 @@ void UI_DisplayMain(void)
 	single_vfo  = -1;
 
 	if (g_eeprom.config.setting.dual_watch == DUAL_WATCH_OFF && g_eeprom.config.setting.cross_vfo == CROSS_BAND_OFF)
+	{
 		single_vfo = main_vfo_num;
+	}
 	else
 	if (g_eeprom.config.setting.dual_watch != DUAL_WATCH_OFF && g_rx_vfo_is_active)
 		current_vfo_num = g_rx_vfo_num;
@@ -904,12 +906,20 @@ void UI_DisplayMain(void)
 		#endif
 	#endif
 
-	#ifdef ENABLE_SINGLE_VFO_CHAN
-		if (single_vfo >= 0 && !pan_enabled)
-		{
-			UI_DisplayMainSingle();
-			return;
-		}
+	#if ENABLE_SINGLE_VFO_CHAN
+		#ifdef ENABLE_PANADAPTER
+			if (single_vfo >= 0 && !pan_enabled)
+			{
+				UI_DisplayMainSingle();
+				return;
+			}
+		#else
+			if (single_vfo >= 0)
+			{
+				UI_DisplayMainSingle();
+				return;
+			}
+		#endif
 	#endif
 
 	for (vfo_num = 0; vfo_num < 2; vfo_num++)