diff --git a/PrinterControls/TemperatureIndicator.cs b/PrinterControls/TemperatureIndicator.cs
index a8714524b..dd1e4d5ca 100644
--- a/PrinterControls/TemperatureIndicator.cs
+++ b/PrinterControls/TemperatureIndicator.cs
@@ -553,6 +553,7 @@ namespace MatterHackers.MatterControl
 		{
 			AddChildElements();
 			AddHandlers();
+			this.Name = "Bed Temperature Controls Widget";
 		}
 
 		override protected string HelpText
diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs
index 43fecb260..4cd07e720 100644
--- a/SlicerConfiguration/SliceSettingsWidget.cs
+++ b/SlicerConfiguration/SliceSettingsWidget.cs
@@ -873,6 +873,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 
 							MHNumberEdit doubleEditWidget = new MHNumberEdit(0, allowDecimals: true, pixelWidth: doubleEditWidth, tabIndex: tabIndexForItem++);
 							doubleEditWidget.ToolTipText = settingData.HelpText;
+							doubleEditWidget.Name = settingData.PresentationName + " Textbox";
 
 							double currentValue = 0;
 							bool ChangesMultipleOtherSettings = settingData.SetSettingsOnChange.Count > 0;
diff --git a/Tests/MatterControl.AutomationTests/SliceSetingsTests.cs b/Tests/MatterControl.AutomationTests/SliceSetingsTests.cs
index 744ab1358..6aaec350f 100644
--- a/Tests/MatterControl.AutomationTests/SliceSetingsTests.cs
+++ b/Tests/MatterControl.AutomationTests/SliceSetingsTests.cs
@@ -112,5 +112,57 @@ namespace MatterHackers.MatterControl.UI
 			Assert.IsTrue(testHarness.AllTestsPassed);
 			Assert.IsTrue(testHarness.TestCount == 0); // make sure we ran all our tests
 		}
+
+		[Test, RequiresSTA, RunInApplicationDomain]
+		public void HasHeatedBedCheckedHidesBedTemperatureOptions()
+		{
+			// Run a copy of MatterControl
+			Action<AutomationTesterHarness> testToRun = (AutomationTesterHarness resultsHarness) =>
+			{
+				AutomationRunner testRunner = new AutomationRunner(MatterControlUtilities.DefaultTestImages);
+				{
+
+					MatterControlUtilities.SelectAndAddPrinter(testRunner, "Airwolf 3D", "HD", true);
+
+					//Navigate to Settings Tab and make sure Bed Temp Text box is visible 
+					testRunner.ClickByName("SettingsAndControls");
+					testRunner.Wait(1);
+					testRunner.ClickByName("User Level Dropdown");
+					testRunner.Wait(1);
+					testRunner.ClickByName("Advanced Menu Item");
+					testRunner.Wait(1);
+					testRunner.ClickByName("Filament Tab");
+					testRunner.Wait(1);
+					resultsHarness.AddTestResult(testRunner.WaitForName("Bed Temperature Textbox", 2));
+
+					//Uncheck Has Heated Bed checkbox and make sure Bed Temp Textbox is not visible
+					testRunner.ClickByName("Printer Tab");
+					testRunner.Wait(1);
+					testRunner.ClickByName("Features Tab");
+					testRunner.Wait(1);
+					testRunner.ClickByName("Has Heated Bed Checkbox");
+					testRunner.Wait(.5);
+					testRunner.ClickByName("Filament Tab");
+					testRunner.Wait(1);
+					bool bedTemperatureTextBoxVisible = testRunner.WaitForName("Bed Temperature Textbox", 2);
+					resultsHarness.AddTestResult(bedTemperatureTextBoxVisible == false);
+
+					//Make sure Bed Temperature Options are not visible in printer controls
+					testRunner.ClickByName("Controls Tab");
+					bool bedTemperatureControlsWidget = testRunner.WaitForName("Bed Temperature Controls Widget", 2);
+					resultsHarness.AddTestResult(bedTemperatureTextBoxVisible == false);
+
+
+
+
+					MatterControlUtilities.CloseMatterControl(testRunner);
+				}
+			};
+
+			AutomationTesterHarness testHarness = MatterControlUtilities.RunTest(testToRun);
+
+			Assert.IsTrue(testHarness.AllTestsPassed);
+			Assert.IsTrue(testHarness.TestCount == 3); // make sure we ran all our tests
+		}
 	}
 }