diff --git a/app/app.c b/app/app.c
index 0122e8393..f4ed8322f 100644
--- a/app/app.c
+++ b/app/app.c
@@ -1590,10 +1590,9 @@ static void ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 			SETTINGS_SaveChannel(gTxVfo->CHANNEL_SAVE, gEeprom.TX_VFO, gTxVfo, flagSaveChannel);
 			flagSaveChannel = false;
 
-			RADIO_ConfigureChannel(gEeprom.TX_VFO, VFO_CONFIGURE);
-			RADIO_SetupRegisters(true);
-
-			GUI_SelectNextDisplay(DISPLAY_MAIN);
+			if (!SCANNER_IsScanning() && gVfoConfigureMode == VFO_CONFIGURE_NONE)
+				// gVfoConfigureMode is so as we don't wipe out previously setting this variable elsewhere
+				gVfoConfigureMode = VFO_CONFIGURE;
 		}
 	}
 	else { // key pressed or held
diff --git a/app/main.c b/app/main.c
index e5e146fe6..a0431ccfc 100644
--- a/app/main.c
+++ b/app/main.c
@@ -639,6 +639,8 @@ static void MAIN_Key_UP_DOWN(bool bKeyPressed, bool bKeyHeld, int8_t Direction)
 					return;
 				}
 				gTxVfo->freq_config_RX.Frequency = frequency;
+				BK4819_SetFrequency(frequency);
+				BK4819_RX_TurnOn();
 				gRequestSaveChannel = 1;
 				return;
 			}