diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp
index fdfb6bfe8..84a628572 100644
--- a/src/slic3r/GUI/GCodeViewer.cpp
+++ b/src/slic3r/GUI/GCodeViewer.cpp
@@ -3182,14 +3182,10 @@ void GCodeViewer::render_shells()
     if (shader == nullptr)
         return;
 
-//    glsafe(::glDepthMask(GL_FALSE));
-
     shader->start_using();
     const Camera& camera = wxGetApp().plater()->get_camera();
     m_shells.volumes.render(GLVolumeCollection::ERenderType::Transparent, true, camera.get_view_matrix(), camera.get_projection_matrix());
     shader->stop_using();
-
-//    glsafe(::glDepthMask(GL_TRUE));
 }
 
 void GCodeViewer::render_legend(float& legend_height)
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index 53df78bf2..0adfdb92e 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -1515,12 +1515,12 @@ void GLCanvas3D::render()
     _render_background();
 
     _render_objects(GLVolumeCollection::ERenderType::Opaque);
-    if (!m_main_toolbar.is_enabled())
-        _render_gcode();
     _render_sla_slices();
     _render_selection();
     if (is_looking_downward)
         _render_bed(camera.get_view_matrix(), camera.get_projection_matrix(), false, true);
+    if (!m_main_toolbar.is_enabled())
+        _render_gcode();
     _render_objects(GLVolumeCollection::ERenderType::Transparent);
 
     _render_sequential_clearance();