diff --git a/src/Mod/PartDesign/App/FeatureLinearPattern.cpp b/src/Mod/PartDesign/App/FeatureLinearPattern.cpp
index 7826abf175..2ba1df02a2 100644
--- a/src/Mod/PartDesign/App/FeatureLinearPattern.cpp
+++ b/src/Mod/PartDesign/App/FeatureLinearPattern.cpp
@@ -238,11 +238,21 @@ void LinearPattern::handleChangedPropertyType(Base::XMLReader& reader, const cha
 
 void LinearPattern::onChanged(const App::Property* prop)
 {
+    auto mode = static_cast<LinearPatternMode>(Mode.getValue());
+
     if (prop == &Mode) {
-        auto mode = static_cast<LinearPatternMode>(Mode.getValue());
         setReadWriteStatusForMode(mode);
     }
 
+    // Keep Length in sync with Offset
+    if (mode == LinearPatternMode::offset && prop == &Offset && !Length.testStatus(App::Property::Status::Immutable)) {
+        Length.setValue(Offset.getValue() * (Occurrences.getValue() - 1));
+    }
+
+    if (mode == LinearPatternMode::length && prop == &Length && !Offset.testStatus(App::Property::Status::Immutable)) {
+        Offset.setValue(Length.getValue() / (Occurrences.getValue() - 1));
+    }
+
     Transformed::onChanged(prop);
 }
 
diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp
index 8ed53aac18..b0e6c13d64 100644
--- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp
@@ -198,7 +198,6 @@ void TaskLinearPatternParameters::setupUI()
     }
 
     adaptVisibilityToMode();
-    updateUI();
     connectSignals();
 }
 
@@ -241,6 +240,8 @@ void TaskLinearPatternParameters::adaptVisibilityToMode()
 
     ui->lengthWrapper->setVisible(mode == PartDesign::LinearPatternMode::length);
     ui->offsetWrapper->setVisible(mode == PartDesign::LinearPatternMode::offset);
+
+    updateUI();
 }
 
 void TaskLinearPatternParameters::onUpdateViewTimer()