diff --git a/AboutPage/UpdateControlView.cs b/AboutPage/UpdateControlView.cs
index 14c17cc15..7ea08f8d9 100644
--- a/AboutPage/UpdateControlView.cs
+++ b/AboutPage/UpdateControlView.cs
@@ -183,7 +183,7 @@ namespace MatterHackers.MatterControl
                 SystemWindow topSystemWindow = parent as SystemWindow;
                 if (topSystemWindow != null)
                 {
-                    topSystemWindow.Close();
+                    topSystemWindow.CloseOnIdle();
                 }
             }
             catch
diff --git a/ConfigurationPage/PrintLevelWizard.cs b/ConfigurationPage/PrintLevelWizard.cs
index fb89e0b3d..a9bb22b6a 100644
--- a/ConfigurationPage/PrintLevelWizard.cs
+++ b/ConfigurationPage/PrintLevelWizard.cs
@@ -211,11 +211,12 @@ namespace MatterHackers.MatterControl
         {
             if (PrinterCommunication.Instance.LastReportedPosition.z - moveAmount < 0)
             {
-                if (!StyledMessageBox.ShowMessageBox(zIsTooLowMessage, zTooLowTitle, StyledMessageBox.MessageType.OK))
+                UiThread.RunOnIdle( (state) => 
                 {
-                    // don't move the bed lower it will not work when we print.
-                    return;
-                }
+                    StyledMessageBox.ShowMessageBox(zIsTooLowMessage, zTooLowTitle, StyledMessageBox.MessageType.OK);
+                });
+                // don't move the bed lower it will not work when we print.
+                return;
             }
             PrinterCommunication.Instance.MoveRelative(PrinterCommunication.Axis.Z, -moveAmount, ZMovementSpeed());
             PrinterCommunication.Instance.ReadPosition();
diff --git a/PartPreviewWindow/GcodeViewBasic.cs b/PartPreviewWindow/GcodeViewBasic.cs
index 17202448b..2c671d625 100644
--- a/PartPreviewWindow/GcodeViewBasic.cs
+++ b/PartPreviewWindow/GcodeViewBasic.cs
@@ -493,8 +493,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
             SetProcessingMessage("");
             if (gcodeViewWidget != null
                 && gcodeViewWidget.LoadedGCode != null
-                && gcodeViewWidget.LoadedGCode.GCodeCommandQueue.Count > 0
-                && gcodeViewWidget.LoadedGCode.GCodeCommandQueue[0].secondsToEndFromHere > 0)
+                && gcodeViewWidget.LoadedGCode.GCodeCommandQueue.Count > 0)
             {
                 CreateOptionsContent();