diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index a74d3cac..bae9da80 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -8631,7 +8631,6 @@ void restore_print_from_eeprom() {
 	for (int i = 0; i < depth; i++) {
 		for (int j = 0; j < 8; j++) {
 			dir_name[j] = eeprom_read_byte((uint8_t*)EEPROM_DIRS + j + 8 * i);
-
 		}
 		dir_name[8] = '\0';
 		MYSERIAL.println(dir_name);
@@ -8640,7 +8639,6 @@ void restore_print_from_eeprom() {
 
 	for (int i = 0; i < 8; i++) {
 		filename[i] = eeprom_read_byte((uint8_t*)EEPROM_FILENAME + i);
-
 	}
 	filename[8] = '\0';
 
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index c92e4835..9a059be3 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -7138,6 +7138,7 @@ static void menu_action_sdfile(const char* filename, char* longFilename)
 	  if (strcmp((cmd + i + 4), end) == 0) { 
 		  //filename is shorter then 8.3, store '\0' character on position where ".gco" string was found to terminate stored string properly
  		  eeprom_write_byte((uint8_t*)EEPROM_FILENAME + i, '\0');
+		  break;
 	  }
 	  else {
 		  eeprom_write_byte((uint8_t*)EEPROM_FILENAME + i, cmd[i + 4]);