diff --git a/app/menu.c b/app/menu.c
index 76ad9e5..33ed18e 100644
--- a/app/menu.c
+++ b/app/menu.c
@@ -278,7 +278,7 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)
 
 		case MENU_SCRAMBLER:
 			*pMin = 0;
-			*pMax = 31;
+			*pMax = g_eeprom.config.setting.enable_scrambler ? 31 : 0;
 			break;
 
 		case MENU_TX_TO:
@@ -531,14 +531,22 @@ void MENU_AcceptSetting(void)
 			return;
 
 		case MENU_SCRAMBLER:
-			g_tx_vfo->channel.scrambler = g_sub_menu_selection;
-			#if 0
-				if (g_eeprom.config.setting.enable_scrambler)
-					BK4819_set_scrambler(g_tx_vfo->channel.scrambler);
-				else
-					BK4819_set_scrambler(0);
-			#endif
-			g_request_save_channel = IS_FREQ_CHANNEL(g_tx_vfo->channel_save) ? 2 : 1;
+			if (g_eeprom.config.setting.enable_scrambler)
+			{
+				g_tx_vfo->channel.scrambler = g_sub_menu_selection;
+				#if 0
+					if (g_eeprom.config.setting.enable_scrambler)
+						BK4819_set_scrambler(g_tx_vfo->channel.scrambler);
+					else
+						BK4819_set_scrambler(0);
+				#endif
+				g_request_save_channel = IS_FREQ_CHANNEL(g_tx_vfo->channel_save) ? 2 : 1;
+			}
+			else
+			{
+				g_tx_vfo->channel.scrambler = 0;
+				BK4819_set_scrambler(0);
+			}
 			return;
 
 		case MENU_BUSY_CHAN_LOCK:
diff --git a/firmware.bin b/firmware.bin
index f26ceeb..3d05894 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index 32185a3..46e4b26 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ
diff --git a/radio.c b/radio.c
index 8d3b58f..87e5bfb 100644
--- a/radio.c
+++ b/radio.c
@@ -539,7 +539,7 @@ void RADIO_ConfigureSquelch(vfo_info_t *p_vfo)
 				glitch_close =  glitch_open + 8;
 
 		#else
-			// more sensitive .. use when RX bandwidths are fixed (no weak signal auto adjust)
+			// a little more sensitive
 
 			rssi_open   = (rssi_open   * 3) / 4;
 			noise_open  = (noise_open  * 4) / 3;
diff --git a/ui/menu.c b/ui/menu.c
index 0a6c534..8148d33 100644
--- a/ui/menu.c
+++ b/ui/menu.c
@@ -715,6 +715,10 @@ void UI_DisplayMenu(void)
 
 		case MENU_SCRAMBLER:
 			strcpy(str, "INVERT\n");
+
+			if (g_eeprom.config.setting.enable_scrambler == 0)
+				strcat(str, "DISABLED");
+			else
 			if (g_sub_menu_selection == 0)
 				strcat(str, "OFF");
 			else
@@ -726,6 +730,7 @@ void UI_DisplayMenu(void)
 				else
 					BK4819_set_scrambler(0);
 			#endif
+
 			channel_setting = true;
 			break;