diff --git a/MatterControlLib/ApplicationView/ApplicationController.cs b/MatterControlLib/ApplicationView/ApplicationController.cs
index a686cab26..84b91510d 100644
--- a/MatterControlLib/ApplicationView/ApplicationController.cs
+++ b/MatterControlLib/ApplicationView/ApplicationController.cs
@@ -2367,10 +2367,15 @@ namespace MatterHackers.MatterControl
 
 			try
 			{
-				// If leveling is required or is currently on
-				if(this.RunAnyRequiredPrinterSetup(printer, this.Theme))
+				if (PrinterCalibrationWizard.SetupRequired(printer))
 				{
-					// We need to calibrate. So, don't print this part.
+					UiThread.RunOnIdle(() =>
+					{
+						DialogWindow.Show(
+							new PrinterCalibrationWizard(printer, AppContext.Theme),
+							advanceToIncompleteStage: true);
+					});
+
 					return;
 				}
 
diff --git a/MatterControlLib/ApplicationView/PrinterConfig.cs b/MatterControlLib/ApplicationView/PrinterConfig.cs
index 0660480b5..d7897289c 100644
--- a/MatterControlLib/ApplicationView/PrinterConfig.cs
+++ b/MatterControlLib/ApplicationView/PrinterConfig.cs
@@ -385,7 +385,17 @@ namespace MatterHackers.MatterControl
 		{
 			if (sender is PrinterConfig printer)
 			{
-				ApplicationController.Instance.RunAnyRequiredPrinterSetup(printer, ApplicationController.Instance.Theme);
+				if (PrinterCalibrationWizard.SetupRequired(printer))
+				{
+					UiThread.RunOnIdle(() =>
+					{
+						DialogWindow.Show(
+							new PrinterCalibrationWizard(printer, AppContext.Theme),
+							advanceToIncompleteStage: true);
+					});
+
+					return;
+				}
 			}
 		}