diff --git a/MatterControlLib/ConfigurationPage/PrintLeveling/LoadFilamentWizard.cs b/MatterControlLib/ConfigurationPage/PrintLeveling/LoadFilamentWizard.cs
index 5a4f80d2d..9f1a24549 100644
--- a/MatterControlLib/ConfigurationPage/PrintLeveling/LoadFilamentWizard.cs
+++ b/MatterControlLib/ConfigurationPage/PrintLeveling/LoadFilamentWizard.cs
@@ -42,9 +42,11 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 	public class LoadFilamentWizard : PrinterSetupWizard
 	{
 		private bool onlyLoad;
+		private static double temperatureAtStart;
 
 		public static void Start(PrinterConfig printer, ThemeConfig theme, bool onlyLoad)
 		{
+			temperatureAtStart = printer.Connection.GetTargetHotendTemperature(0);
 			// turn off print leveling
 			var levelingContext = new LoadFilamentWizard(printer, onlyLoad)
 			{
@@ -57,7 +59,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
 			});
 			loadFilamentWizardWindow.Closed += (s, e) =>
 			{
-				printer.Connection.TurnOffBedAndExtruders(TurnOff.AfterDelay);
+				printer.Connection.SetTargetHotendTemperature(0, temperatureAtStart);
 			};
 		}
 
diff --git a/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs b/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs
index 0962be7df..342d04b53 100644
--- a/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs
+++ b/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs
@@ -282,7 +282,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
 					testRunner.Type("{Enter}");
 					testRunner.Delay();
 					testRunner.ClickByName("Load Filament Button");
-					testRunner.ClickByName("Continue Button");
+					testRunner.ClickByName("Next Button");
 					Assert.AreEqual(104, (int)emulator.CurrentExtruder.TargetTemperature);
 					testRunner.Delay();
 					testRunner.ClickByName("Cancel Wizard Button");
@@ -291,7 +291,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
 
 					testRunner.ClickByName("Hotend 0");
 					testRunner.ClickByName("Load Filament Button");
-					testRunner.ClickByName("Continue Button");
+					testRunner.ClickByName("Next Button");
 					testRunner.Delay();
 					Assert.AreEqual(104, (int)emulator.CurrentExtruder.TargetTemperature);
 					var systemWindow = testRunner.GetWidgetByName("Cancel Wizard Button", out SystemWindow containingWindow);
diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
index 2a57e2a00..4555b86c2 100644
--- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
+++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
@@ -239,6 +239,12 @@ namespace MatterHackers.MatterControl.Tests.Automation
 
 			testRunner.WaitForName("Disconnect from printer button");
 
+			testRunner.Delay();
+			if (testRunner.NameExists("Already Loaded Button"))
+			{
+				testRunner.ClickByName("Already Loaded Button");
+			}
+
 			// Access through static instance must occur after Connect has occurred and the port has spun up
 			Emulator.Instance.RunSlow = runSlow;
 
@@ -883,6 +889,12 @@ namespace MatterHackers.MatterControl.Tests.Automation
 			}
 
 			testRunner.ClickByName("Done Button");
+
+			testRunner.Delay();
+			if (testRunner.NameExists("Already Loaded Button"))
+			{
+				testRunner.ClickByName("Already Loaded Button");
+			}
 		}
 
 		/// <summary>