diff --git a/CustomWidgets/ExportQueueItemWindow.cs b/CustomWidgets/ExportQueueItemWindow.cs
index a4de3ac83..1177440d7 100644
--- a/CustomWidgets/ExportQueueItemWindow.cs
+++ b/CustomWidgets/ExportQueueItemWindow.cs
@@ -111,6 +111,11 @@ namespace MatterHackers.MatterControl
         }
 
         void exportGCode_Click(object sender, MouseEventArgs mouseEvent)
+        {
+            UiThread.RunOnIdle(DoExportGCode_Click);
+        }
+
+        void DoExportGCode_Click(object state)
         {
             SaveFileDialogParams saveParams = new SaveFileDialogParams("Export GCode|*.gcode", title: "Export GCode");
 			saveParams.Title = "MatterControl: Export File";
@@ -178,6 +183,11 @@ namespace MatterHackers.MatterControl
         }
 
         void exportSTL_Click(object sender, MouseEventArgs mouseEvent)
+        {
+            UiThread.RunOnIdle(DoExportSTL_Click);
+        }
+
+        void DoExportSTL_Click(object state)
         {
             SaveFileDialogParams saveParams = new SaveFileDialogParams("Save as STL|*.stl");
 			saveParams.Title = "MatterControl: Export File";
diff --git a/PrintLibrary/ExportLibraryItemWindow.cs b/PrintLibrary/ExportLibraryItemWindow.cs
index 59453b760..bc8c71b20 100644
--- a/PrintLibrary/ExportLibraryItemWindow.cs
+++ b/PrintLibrary/ExportLibraryItemWindow.cs
@@ -98,6 +98,11 @@ namespace MatterHackers.MatterControl.PrintLibrary
         }
 
         void exportGCode_Click(object sender, MouseEventArgs mouseEvent)
+        {
+            UiThread.RunOnIdle(DoExportGCode_Click);
+        }
+
+        void DoExportGCode_Click(object state)
         {
             SaveFileDialogParams saveParams = new SaveFileDialogParams("Export GCode|*.gcode", title: "Export GCode");
             saveParams.Title = "MatterControl: Export File";
@@ -165,6 +170,11 @@ namespace MatterHackers.MatterControl.PrintLibrary
         }
 
         void exportSTL_Click(object sender, MouseEventArgs mouseEvent)
+        {
+            UiThread.RunOnIdle(DoExportSTL_Click);
+        }
+
+        void DoExportSTL_Click(object state)
         {
             SaveFileDialogParams saveParams = new SaveFileDialogParams("Save as STL|*.stl");
             saveParams.Title = "MatterControl: Export File";