diff --git a/app/app.c b/app/app.c
index 002f45e..2ebad56 100644
--- a/app/app.c
+++ b/app/app.c
@@ -1869,7 +1869,8 @@ static void ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 	}
 
 	if (Key <= KEY_9 || Key == KEY_F) {
-		if (gScanStateDir != SCAN_OFF || gCssBackgroundScan) { // FREQ/CTCSS/DCS scanning
+		//if (gScanStateDir != SCAN_OFF || gCssBackgroundScan) { // FREQ/CTCSS/DCS scanning
+		if (gCssBackgroundScan) { // FREQ/CTCSS/DCS scanning
 			if (bKeyPressed && !bKeyHeld)
 				AUDIO_PlayBeep(BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL);
 			return;
diff --git a/app/main.c b/app/main.c
index 2a151a6..821e15d 100644
--- a/app/main.c
+++ b/app/main.c
@@ -374,6 +374,33 @@ static void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 	}
 
 	if (!gWasFKeyPressed) { // F-key wasn't pressed
+
+		if (gScanStateDir != SCAN_OFF){
+			switch(Key) {
+				case KEY_0:
+					gEeprom.SCAN_LIST_DEFAULT = 0;
+					break;
+				case KEY_1:
+					gEeprom.SCAN_LIST_DEFAULT = 1;
+					break;
+				case KEY_2:
+					gEeprom.SCAN_LIST_DEFAULT = 2;
+					break;
+				case KEY_3:
+					gEeprom.SCAN_LIST_DEFAULT = 3;
+					break;
+				case KEY_4:
+					gEeprom.SCAN_LIST_DEFAULT = 4;
+					break;
+				case KEY_5:
+					gEeprom.SCAN_LIST_DEFAULT = 5;
+					break;
+				default:
+					break;
+			}
+			return;
+		}
+
 		const uint8_t Vfo = gEeprom.TX_VFO;
 		gKeyInputCountdown = key_input_timeout_500ms;
 		INPUTBOX_Append(Key);