diff --git a/src/Mod/Path/Path/Op/Area.py b/src/Mod/Path/Path/Op/Area.py
index 5a3756cacd..c887839b64 100644
--- a/src/Mod/Path/Path/Op/Area.py
+++ b/src/Mod/Path/Path/Op/Area.py
@@ -272,6 +272,10 @@ class ObjectOp(PathOp.ObjectOp):
         # Note that emitting preambles between moves breaks some dressups and prevents path optimization on some controllers
         pathParams["preamble"] = False
 
+        # disable path sorting for offset and zigzag-offset paths
+        if hasattr(obj, "OffsetPattern") and obj.OffsetPattern in ["ZigZagOffset", "Offset"] and hasattr(obj, "MinTravel") and not obj.MinTravel:
+            pathParams["sort_mode"] = 0
+
         if not self.areaOpRetractTool(obj):
             pathParams["threshold"] = 2.001 * self.radius
 
diff --git a/src/Mod/Path/Path/Op/Gui/PocketBase.py b/src/Mod/Path/Path/Op/Gui/PocketBase.py
index b45410242f..f6ebd7635d 100644
--- a/src/Mod/Path/Path/Op/Gui/PocketBase.py
+++ b/src/Mod/Path/Path/Op/Gui/PocketBase.py
@@ -93,19 +93,10 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
         if not (FeatureRestMachining & self.pocketFeatures()):
             form.useRestMachining.hide()
 
-        # if True:
-        #     # currently doesn't have an effect or is experimental
-        #     form.minTravel.hide()
 
         return form
 
     def updateMinTravel(self, obj, setModel=True):
-        if obj.UseStartPoint:
-            self.form.minTravel.setEnabled(True)
-        else:
-            self.form.minTravel.setChecked(False)
-            self.form.minTravel.setEnabled(False)
-
         if setModel and obj.MinTravel != self.form.minTravel.isChecked():
             obj.MinTravel = self.form.minTravel.isChecked()