diff --git a/MatterControlApplication.cs b/MatterControlApplication.cs
index 51709aab9..9a7a8482d 100644
--- a/MatterControlApplication.cs
+++ b/MatterControlApplication.cs
@@ -53,6 +53,7 @@ using System.Threading.Tasks;
 using MatterHackers.GCodeVisualizer;
 using Gaming.Game;
 using MatterHackers.GuiAutomation;
+using MatterHackers.MatterControl.PrinterControls.PrinterConnections;
 
 namespace MatterHackers.MatterControl
 {
@@ -659,6 +660,12 @@ namespace MatterHackers.MatterControl
 #endif
 
 				AfterFirstDraw?.Invoke();
+
+				if (ActiveSliceSettings.ProfileData.Profiles.Count == 0)
+				{
+					// Start the setup wizard if no profiles exist
+					UiThread.RunOnIdle(() => WizardWindow.Show());
+				}
 			}
 
 			//msGraph.AddData("ms", totalDrawTime.ElapsedMilliseconds);
diff --git a/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs b/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
index a51c565dd..ca94d1cf7 100644
--- a/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
+++ b/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
@@ -71,9 +71,9 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
 			printerModelContainer = CreateSelectionContainer("Model".Localize(), "Select the printer model".Localize(), printerModelSelector);
 
 			//Add inputs to main container
-			contentRow.AddChild(createPrinterNameContainer());
 			contentRow.AddChild(printerMakeContainer);
 			contentRow.AddChild(printerModelContainer);
+			contentRow.AddChild(createPrinterNameContainer());
 
 			//Construct buttons
 			nextButton = textImageButtonFactory.Generate("Save & Continue".Localize());