diff --git a/ApplicationView/PrinterModels.cs b/ApplicationView/PrinterModels.cs
index b2f18be3a..ba1fb5c3a 100644
--- a/ApplicationView/PrinterModels.cs
+++ b/ApplicationView/PrinterModels.cs
@@ -84,6 +84,12 @@ namespace MatterHackers.MatterControl
 			// Store
 			this.EditContext = editContext;
 
+			var contentInfo = editContext.SourceItem as ILibraryAsset;
+			if (contentInfo != null)
+			{
+				this.ContentType = contentInfo.ContentType;
+			}
+
 			// Load
 			if (editContext.SourceItem is ILibraryAssetStream contentStream
 				&& contentStream.ContentType == "gcode")
@@ -351,6 +357,8 @@ namespace MatterHackers.MatterControl
 
 		public bool EditableScene { get; private set; }
 
+		public string ContentType { get; private set; }
+
 		internal void RenderGCode3D(DrawEventArgs e)
 		{
 			if (this.RenderInfo != null)
diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs
index ce0e341b8..99f696635 100644
--- a/PartPreviewWindow/View3D/View3DWidget.cs
+++ b/PartPreviewWindow/View3D/View3DWidget.cs
@@ -240,6 +240,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			if (printerTabPage?.printerActionsBar?.modelViewButton is GuiWidget button)
 			{
 				button.Enabled = sceneContext.EditableScene;
+
+				if (sceneContext.ContentType == "gcode"
+					&& printerTabPage?.printerActionsBar?.layers3DButton is GuiWidget gcodeButton)
+				{
+					gcodeButton.InvokeClick();
+				}
 			}
 
 			this.Invalidate();
diff --git a/PartPreviewWindow/ViewControls3D.cs b/PartPreviewWindow/ViewControls3D.cs
index 54dd78361..2c25f3e71 100644
--- a/PartPreviewWindow/ViewControls3D.cs
+++ b/PartPreviewWindow/ViewControls3D.cs
@@ -30,13 +30,10 @@ either expressed or implied, of the FreeBSD Project.
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using MatterHackers.Agg;
-using MatterHackers.Agg.Image;
-using MatterHackers.Agg.ImageProcessing;
 using MatterHackers.Agg.Platform;
 using MatterHackers.Agg.UI;
 using MatterHackers.DataConverters3D;
@@ -44,7 +41,6 @@ using MatterHackers.Localizations;
 using MatterHackers.MatterControl.CustomWidgets;
 using MatterHackers.MatterControl.DataStorage;
 using MatterHackers.MatterControl.Library;
-using MatterHackers.MeshVisualizer;
 using MatterHackers.VectorMath;
 
 namespace MatterHackers.MatterControl.PartPreviewWindow