diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index b5b2aa28c1..c2a4e752f6 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -3593,11 +3593,6 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
                     update_sequential_clearance(true);
             }
         }
-        else if (evt.LeftUp() &&
-            m_gizmos.get_current_type() == GLGizmosManager::EType::Scale &&
-            m_gizmos.get_current()->get_state() == GLGizmoBase::EState::On) {
-            wxGetApp().obj_list()->selection_changed();
-        }
 
         return;
     }
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
index 885f9d97a2..36576e9494 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
@@ -835,6 +835,8 @@ void GLGizmoCut3D::on_load(cereal::BinaryInputArchive& ar)
     ar( m_keep_upper, m_keep_lower, m_rotate_lower, m_rotate_upper, m_hide_cut_plane, m_mode, m_connectors_editing,
         m_ar_plane_center, m_rotation_m);
 
+    m_start_dragging_m = m_rotation_m;
+
     m_transformed_bounding_box = transformed_bounding_box(m_ar_plane_center, m_rotation_m);
     set_center_pos(m_ar_plane_center);
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
index 1a7251ddf7..6cc852c6a6 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
@@ -99,6 +99,12 @@ void GLGizmoScale3D::enable_ununiversal_scale(bool enable)
         m_grabbers[i].enabled = enable;
 }
 
+void GLGizmoScale3D::on_set_state()
+{
+    if (m_state == On)
+        wxGetApp().obj_list()->selection_changed();
+}
+
 void GLGizmoScale3D::data_changed(bool is_serializing) {
     set_scale(Vec3d::Ones());
 }
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp b/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
index 6a7b4a331e..6e304061ab 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
@@ -74,6 +74,8 @@ protected:
     virtual void on_register_raycasters_for_picking() override;
     virtual void on_unregister_raycasters_for_picking() override;
 
+    void on_set_state() override;
+
 private:
     void render_grabbers_connection(unsigned int id_1, unsigned int id_2, const ColorRGBA& color);