diff --git a/app/app.c b/app/app.c
index 6785e1f..002f45e 100644
--- a/app/app.c
+++ b/app/app.c
@@ -1466,6 +1466,12 @@ void APP_TimeSlice500ms(void)
 	{
 		if (--gKeyInputCountdown == 0)
 		{
+
+			if (IS_MR_CHANNEL(gTxVfo->CHANNEL_SAVE) && (gInputBoxIndex == 1 || gInputBoxIndex == 2))
+			{
+				SETTINGS_SaveVfoIndices();
+			}
+
 			cancelUserInputModes();
 
 			if (gBeepToPlay != BEEP_NONE)
diff --git a/app/main.c b/app/main.c
index c90e4f3..c568039 100644
--- a/app/main.c
+++ b/app/main.c
@@ -340,7 +340,10 @@ void channelMove(uint16_t Channel, bool End)
 	gVfoConfigureMode          = VFO_CONFIGURE_RELOAD;
 
 	RADIO_ConfigureChannel(gEeprom.TX_VFO, gVfoConfigureMode);
-	SETTINGS_SaveVfoIndices();
+	if(End)
+	{
+		SETTINGS_SaveVfoIndices();
+	}
 
 	return;
 }
@@ -378,7 +381,7 @@ static void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 
 		if (IS_MR_CHANNEL(gTxVfo->CHANNEL_SAVE)) { // user is entering channel number
 
-			gKeyInputCountdown = (key_input_timeout_500ms / 6); // short time...
+			gKeyInputCountdown = (key_input_timeout_500ms / 5); // short time...
 
 			if (gInputBoxIndex != 3) {
 				#ifdef ENABLE_VOICE