diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.cpp b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
index 02ca898525..4f85667e0d 100644
--- a/src/slic3r/GUI/GUI_ObjectManipulation.cpp
+++ b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
@@ -1095,6 +1095,7 @@ void ObjectManipulation::set_world_coordinates(const bool world_coordinates)
     m_world_coordinates = world_coordinates;
     this->UpdateAndShow(true);
     GLCanvas3D* canvas = wxGetApp().plater()->canvas3D();
+    canvas->get_gizmos_manager().update_data();
     canvas->set_as_dirty();
     canvas->request_extra_frame();
 }
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
index fde0e0e5ea..deaa95b904 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
@@ -101,6 +101,10 @@ void GLGizmoScale3D::on_start_dragging()
             m_starting.pivots[3] = trafo * Vec3d(center.x(), m_starting.box.min.y(), center.z());
             m_starting.pivots[4] = trafo * Vec3d(center.x(), center.y(), m_starting.box.max.z());
             m_starting.pivots[5] = trafo * Vec3d(center.x(), center.y(), m_starting.box.min.z());
+            m_starting.pivots[6] = trafo * Vec3d(m_starting.box.max.x(), m_starting.box.max.y(), center.z());
+            m_starting.pivots[7] = trafo * Vec3d(m_starting.box.min.x(), m_starting.box.max.y(), center.z());
+            m_starting.pivots[8] = trafo * Vec3d(m_starting.box.min.x(), m_starting.box.min.y(), center.z());
+            m_starting.pivots[9] = trafo * Vec3d(m_starting.box.max.x(), m_starting.box.min.y(), center.z());
         }
 #else
         m_starting.drag_position = m_grabbers[m_hover_id].center;
@@ -261,18 +265,22 @@ void GLGizmoScale3D::on_render()
     // uniform
 #if ENABLE_WORLD_COORDINATE
     m_grabbers[6].center = { -(box_half_size.x() + Offset), -(box_half_size.y() + Offset), 0.0 };
+    m_grabbers[6].color = (use_constrain && m_hover_id == 8) ? CONSTRAINED_COLOR : m_highlight_color;
     m_grabbers[7].center = { box_half_size.x() + Offset, -(box_half_size.y() + Offset), 0.0 };
+    m_grabbers[7].color = (use_constrain && m_hover_id == 9) ? CONSTRAINED_COLOR : m_highlight_color;
     m_grabbers[8].center = { box_half_size.x() + Offset, box_half_size.y() + Offset, 0.0 };
+    m_grabbers[8].color = (use_constrain && m_hover_id == 6) ? CONSTRAINED_COLOR : m_highlight_color;
     m_grabbers[9].center = { -(box_half_size.x() + Offset), box_half_size.y() + Offset, 0.0 };
+    m_grabbers[9].color = (use_constrain && m_hover_id == 7) ? CONSTRAINED_COLOR : m_highlight_color;
 #else
     m_grabbers[6].center = m_transform * Vec3d(m_box.min.x(), m_box.min.y(), center.z()) - offset_x - offset_y;
     m_grabbers[7].center = m_transform * Vec3d(m_box.max.x(), m_box.min.y(), center.z()) + offset_x - offset_y;
     m_grabbers[8].center = m_transform * Vec3d(m_box.max.x(), m_box.max.y(), center.z()) + offset_x + offset_y;
     m_grabbers[9].center = m_transform * Vec3d(m_box.min.x(), m_box.max.y(), center.z()) - offset_x + offset_y;
-#endif // ENABLE_WORLD_COORDINATE
     for (int i = 6; i < 10; ++i) {
         m_grabbers[i].color = m_highlight_color;
     }
+#endif // ENABLE_WORLD_COORDINATE
 
 #if !ENABLE_WORLD_COORDINATE
     // sets grabbers orientation
@@ -472,7 +480,20 @@ void GLGizmoScale3D::do_scale_uniform(const UpdateData& data)
     const double ratio = calc_ratio(data);
     if (ratio > 0.0) {
         m_scale = m_starting.scale * ratio;
+#if ENABLE_WORLD_COORDINATE
+        if (m_starting.ctrl_down) {
+            m_offset = 0.5 * (ratio - 1.0) * m_starting.box.size();
+            if (m_hover_id == 6 || m_hover_id == 9)
+                m_offset.x() *= -1.0;
+            if (m_hover_id == 6 || m_hover_id == 7)
+                m_offset.y() *= -1.0;
+        }
+        else {
+#endif // ENABLE_WORLD_COORDINATE
         m_offset = Vec3d::Zero();
+#if ENABLE_WORLD_COORDINATE
+        }
+#endif // ENABLE_WORLD_COORDINATE
     }
 }
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp b/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
index 26badc5252..160fd4b179 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
@@ -21,7 +21,8 @@ class GLGizmoScale3D : public GLGizmoBase
         Vec3d center{ Vec3d::Zero() };
 #endif // ENABLE_WORLD_COORDINATE
         BoundingBoxf3 box;
-        std::array<Vec3d, 6> pivots{ Vec3d::Zero(), Vec3d::Zero(), Vec3d::Zero(), Vec3d::Zero(), Vec3d::Zero(), Vec3d::Zero() };
+        std::array<Vec3d, 10> pivots{ Vec3d::Zero(), Vec3d::Zero(), Vec3d::Zero(), Vec3d::Zero(), Vec3d::Zero(),
+            Vec3d::Zero(), Vec3d::Zero(), Vec3d::Zero(), Vec3d::Zero(),Vec3d::Zero() };
     };
 
     BoundingBoxf3 m_box;
diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp
index 82ccb46f22..ffc63f2883 100644
--- a/src/slic3r/GUI/Selection.cpp
+++ b/src/slic3r/GUI/Selection.cpp
@@ -608,12 +608,14 @@ bool Selection::requires_uniform_scale() const
         return !Geometry::is_rotation_ninety_degrees(Geometry::Transformation(get_volume(*m_list.begin())->world_matrix()).get_rotation());
     else if (is_single_full_instance() && wxGetApp().obj_manipul()->get_world_coordinates())
         return !Geometry::is_rotation_ninety_degrees(get_volume(*m_list.begin())->get_instance_rotation());
+
+    return false;
 #else
     if (is_single_full_instance() || is_single_modifier() || is_single_volume())
         return false;
-#endif // ENABLE_WORLD_COORDINATE
 
     return true;
+#endif // ENABLE_WORLD_COORDINATE
 }
 
 int Selection::get_object_idx() const