diff --git a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp
index 891971dbc5..5a1b27a1a4 100644
--- a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp
@@ -601,9 +601,7 @@ void TaskRevolutionParameters::onMidplane(bool on)
         propMidPlane->setValue(on);
         recomputeFeature();
 
-        if (gizmoContainer) {
-            rotationGizmo->setMultFactor(rotationGizmo->getMultFactor() * (on ? 0.5 : 2));
-        }
+        setGizmoPositions();
     }
 }
 
@@ -643,9 +641,7 @@ void TaskRevolutionParameters::onModeChanged(int index)
     updateUI(index);
     recomputeFeature();
 
-    if (gizmoContainer) {
-        setGizmoVisibility();
-    }
+    setGizmoPositions();
 }
 
 void TaskRevolutionParameters::getReferenceAxis(
@@ -744,8 +740,9 @@ void TaskRevolutionParameters::setupGizmos(ViewProvider* vp)
     rotationGizmo->flipArrow();
     rotationGizmo2->flipArrow();
 
+    defaultGizmoMultFactor = rotationGizmo->getMultFactor();
+
     setGizmoPositions();
-    setGizmoVisibility();
 }
 
 void TaskRevolutionParameters::setGizmoPositions()
@@ -758,8 +755,10 @@ void TaskRevolutionParameters::setGizmoPositions()
     Base::Vector3d basePos;
     Base::Vector3d axisDir;
     bool reversed = false;
+    bool symmetric = false;
+    std::string sideType;
 
-    auto getFeatureProps = [&profileCog, &basePos, &axisDir, &reversed](auto* feature) {
+    auto getFeatureProps = [&](auto* feature) {
         if (!feature || feature->isError()) {
             return false;
         }
@@ -769,11 +768,14 @@ void TaskRevolutionParameters::setGizmoPositions()
         basePos = feature->Base.getValue();
         axisDir = feature->Axis.getValue();
         reversed = feature->Reversed.getValue();
+        symmetric = feature->Midplane.getValue();
+        sideType = std::string(feature->Type.getValueAsString());
         return true;
     };
 
     bool ret;
     if (isGroove) {
+        auto groove = getObject<PartDesign::Groove>();
         ret = getFeatureProps(getObject<PartDesign::Groove>());
     }
     else {
@@ -796,28 +798,17 @@ void TaskRevolutionParameters::setGizmoPositions()
 
     rotationGizmo->Gizmo::setDraggerPlacement(basePos + axisComp, normalComp);
     rotationGizmo->getDraggerContainer()->setArcNormalDirection(Base::convertTo<SbVec3f>(axisDir));
+    rotationGizmo->setVisibility(sideType == "Angle" || sideType == "TwoAngles");
 
     rotationGizmo2->Gizmo::setDraggerPlacement(basePos + axisComp, normalComp);
     rotationGizmo2->getDraggerContainer()->setArcNormalDirection(Base::convertTo<SbVec3f>(-axisDir));
-}
+    rotationGizmo2->setVisibility(sideType == "TwoAngles");
 
-void TaskRevolutionParameters::setGizmoVisibility()
-{
-    auto type = static_cast<PartDesign::Revolution::RevolMethod>(ui->changeMode->currentIndex());
-
-    switch (type) {
-        case PartDesign::Revolution::RevolMethod::Angle:
-            gizmoContainer->visible = true;
-            rotationGizmo->setVisibility(true);
-            rotationGizmo2->setVisibility(false);
-            break;
-        case PartDesign::Revolution::RevolMethod::TwoAngles:
-            gizmoContainer->visible = true;
-            rotationGizmo->setVisibility(true);
-            rotationGizmo2->setVisibility(true);
-            break;
-        default:
-            gizmoContainer->visible = false;
+    if (sideType == "TwoAngles" || !symmetric) {
+        rotationGizmo->setMultFactor(defaultGizmoMultFactor);
+    }
+    else {
+        rotationGizmo->setMultFactor(defaultGizmoMultFactor / 2.0);
     }
 }
 
diff --git a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h
index e0aa3bb5d0..352b362502 100644
--- a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h
+++ b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.h
@@ -121,6 +121,7 @@ private:
     QWidget* proxy;
     bool selectionFace;
     bool isGroove;
+    double defaultGizmoMultFactor;
 
     /**
      * @brief axesInList is the list of links corresponding to axis combo; must
@@ -137,7 +138,6 @@ private:
     Gui::RadialGizmo* rotationGizmo2 = nullptr;
     void setupGizmos(ViewProvider* vp);
     void setGizmoPositions();
-    void setGizmoVisibility();
 };
 
 class TaskDlgRevolutionParameters: public TaskDlgSketchBasedParameters