diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs
index 006b652aa..c76fe0f87 100644
--- a/PartPreviewWindow/ViewGcodeBasic.cs
+++ b/PartPreviewWindow/ViewGcodeBasic.cs
@@ -219,7 +219,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
         void TrackballTumbleWidget_DrawGlContent(object sender, EventArgs e)
         {
-            gcodeViewWidget.gCodeRenderer.Render3D(gcodeViewWidget.ActiveLayerIndex, gcodeViewWidget.TotalTransform, 1, RenderType.All, 
+            gcodeViewWidget.gCodeRenderer.Render3D(0, Math.Min(gcodeViewWidget.ActiveLayerIndex+1, gcodeViewWidget.LoadedGCode.NumChangesInZ), gcodeViewWidget.TotalTransform, 1, RenderType.All, 
                 gcodeViewWidget.FeatureToStartOnRatio0To1, gcodeViewWidget.FeatureToEndOnRatio0To1);
         }