diff --git a/SlicerConfiguration/SliceSettingsDetailControl.cs b/SlicerConfiguration/SliceSettingsDetailControl.cs
index 5ff50f6df..7be09ec26 100644
--- a/SlicerConfiguration/SliceSettingsDetailControl.cs
+++ b/SlicerConfiguration/SliceSettingsDetailControl.cs
@@ -57,7 +57,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 			var overflowDropdown = new OverflowDropdown(false)
 			{
 				AlignToRightEdge = true,
-				Name = "Slice Settings Options Menu"
+				Name = "Slice Settings Overflow Menu"
 			};
 
 			showHelpBox = new CheckBox("Show Help".Localize());
diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs
index dbd1cd87f..2c8dc4558 100644
--- a/SlicerConfiguration/SliceSettingsWidget.cs
+++ b/SlicerConfiguration/SliceSettingsWidget.cs
@@ -276,7 +276,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 				}
 
 				string settingsLevel = UserSettings.Instance.get(UserSettingsKey.SliceSettingsLevel);
-				if (SliceSettingsOrganizer.Instance.UserLevels.ContainsKey(settingsLevel))
+				if (!string.IsNullOrEmpty(settingsLevel)
+					&& SliceSettingsOrganizer.Instance.UserLevels.ContainsKey(settingsLevel))
 				{
 					return settingsLevel;
 				}
diff --git a/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs b/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs
index 9424b8c0e..221a696ff 100644
--- a/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs
+++ b/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs
@@ -68,8 +68,8 @@ namespace MatterHackers.MatterControl.Tests.Automation
 					// reset to defaults and make sure print leveling is cleared
 					testRunner.SwitchToAdvancedSliceSettings();
 
-					testRunner.ClickByName("Slice Settings Options Menu", 1);
-					testRunner.ClickByName("Reset to Defaults Menu Item", 1);
+					testRunner.ClickByName("Slice Settings Overflow Menu");
+					testRunner.ClickByName("Reset to Defaults Menu Item");
 					testRunner.ClickByName("Yes Button", .5);
 					testRunner.Delay(1);
 
diff --git a/Tests/MatterControl.AutomationTests/PrinterDropDownTests.cs b/Tests/MatterControl.AutomationTests/PrinterDropDownTests.cs
index b5a29f5e8..abf6e290a 100644
--- a/Tests/MatterControl.AutomationTests/PrinterDropDownTests.cs
+++ b/Tests/MatterControl.AutomationTests/PrinterDropDownTests.cs
@@ -9,30 +9,26 @@ using NUnit.Framework;
 
 namespace MatterHackers.MatterControl.Tests.Automation
 {
-	[TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain]
+	[TestFixture, Category("MatterControl.UI.Automation"), RunInApplicationDomain, Apartment(ApartmentState.STA)]
 	public class PrinterNameChangePersists
 	{
-		[Test, Apartment(ApartmentState.STA)]
+		[Test]
 		public async Task PrinterNameStaysChanged()
 		{
-			AutomationTest testToRun = (testRunner) =>
+			await MatterControlUtilities.RunTest((testRunner) =>
 			{
-				testRunner.CloseSignInAndPrinterSelect();
-
 				testRunner.AddAndSelectPrinter("Airwolf 3D", "HD");
 
 				testRunner.SwitchToAdvancedSliceSettings();
 
 				testRunner.ClickByName("Printer Tab", 1);
 
-				string widgetName = "Printer Name Edit";
-				testRunner.ClickByName(widgetName);
+				testRunner.ClickByName("Printer Name Edit");
 
-				SystemWindow window;
-				var textWidget = testRunner.GetWidgetByName(widgetName, out window);
+				var textWidget = testRunner.GetWidgetByName("Printer Name Edit", out _);
 				string newName = "Updated name";
 				textWidget.Text = newName;
-				testRunner.ClickByName("Printer Tab", 1);
+				testRunner.ClickByName("Printer Tab");
 				testRunner.Delay(4);
 
 				//Check to make sure the Printer dropdown gets the name change 
@@ -40,12 +36,10 @@ namespace MatterHackers.MatterControl.Tests.Automation
 				Assert.IsTrue(testRunner.WaitForName(newName + " Menu Item"), "Widget with updated printer name exists");
 
 				//Make sure the Active profile name changes as well
-				Assert.IsTrue(ProfileManager.Instance.ActiveProfile.Name == newName, "ActiveProfile has updated name");
+				Assert.AreEqual(newName, ProfileManager.Instance.ActiveProfile.Name, "ActiveProfile has updated name");
 
 				return Task.CompletedTask;
-			};
-
-			await MatterControlUtilities.RunTest(testToRun);
+			});
 		}
 	}
 }
diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
index 98df2803d..c4b57862b 100644
--- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
+++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
@@ -541,6 +541,9 @@ namespace MatterHackers.MatterControl.Tests.Automation
 			// Switch to Slice Settings Tab
 			testRunner.ClickByName("Slice Settings Tab");
 
+			// Show the overflow menu
+			testRunner.ClickByName("Slice Settings Overflow Menu");
+
 			// Change to Advanced view
 			testRunner.ClickByName("User Level Dropdown");
 			testRunner.ClickByName("Advanced Menu Item");