diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp
index 8ef333d69..9c0341ff4 100644
--- a/src/slic3r/GUI/3DScene.cpp
+++ b/src/slic3r/GUI/3DScene.cpp
@@ -306,7 +306,7 @@ void GLVolume::SinkingContours::update()
     int object_idx = m_parent.object_idx();
     Model& model = GUI::wxGetApp().plater()->model();
 
-    if (0 <= object_idx && object_idx < model.objects.size() && m_parent.is_sinking() && !m_parent.is_below_printbed()) {
+    if (0 <= object_idx && object_idx < (int)model.objects.size() && m_parent.is_sinking() && !m_parent.is_below_printbed()) {
         const BoundingBoxf3& box = m_parent.transformed_convex_hull_bounding_box();
         if (!m_old_box.size().isApprox(box.size()) || m_old_box.min.z() != box.min.z()) {
             m_old_box = box;
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
index 7d3f5c3df..40654422e 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
@@ -55,8 +55,15 @@ std::string GLGizmoCut::on_get_name() const
 void GLGizmoCut::on_set_state()
 {
     // Reset m_cut_z on gizmo activation
+#if ENABLE_SINKING_CONTOURS
+    if (get_state() == On) {
+        m_cut_z = bounding_box().center().z();
+        m_cut_contours.reset();
+    }
+#else
     if (get_state() == On)
         m_cut_z = bounding_box().center().z();
+#endif // ENABLE_SINKING_CONTOURS
 }
 
 bool GLGizmoCut::on_is_activable() const
@@ -211,10 +218,9 @@ void GLGizmoCut::on_render_input_window(float x, float y, float bottom_limit)
 
     if (cut_clicked && (m_keep_upper || m_keep_lower)) {
         perform_cut(m_parent.get_selection());
-        m_cut_contours.cut_z = 0.0f;
-        m_cut_contours.object_idx = -1;
-        m_cut_contours.instance_idx = -1;
-        m_cut_contours.contours.reset();
+#if ENABLE_SINKING_CONTOURS
+        m_cut_contours.reset();
+#endif // ENABLE_SINKING_CONTOURS
     }
 }
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp
index abd879350..ffea14ad4 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp
@@ -35,6 +35,16 @@ class GLGizmoCut : public GLGizmoBase
         Vec3d shift{ Vec3d::Zero() };
         int object_idx{ -1 };
         int instance_idx{ -1 };
+
+        void reset() {
+            mesh.clear();
+            contours.reset();
+            cut_z = 0.0;
+            position = Vec3d::Zero();
+            shift = Vec3d::Zero();
+            object_idx = -1;
+            instance_idx = -1;
+        }
     };
 
     CutContours m_cut_contours;