diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui
index 7013dd6e28..e4aaf19e5e 100644
--- a/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui
@@ -24,7 +24,7 @@
      </property>
      <layout class="QFormLayout" name="formLayout">
       <item row="0" column="0">
-       <widget class="QLabel" name="label">
+       <widget class="QLabel" name="toolController_label">
         <property name="text">
          <string>ToolController</string>
         </property>
@@ -38,7 +38,7 @@
        </widget>
       </item>
       <item row="1" column="0">
-       <widget class="QLabel" name="label_5">
+       <widget class="QLabel" name="coolantController_label">
         <property name="text">
          <string>Coolant Mode</string>
         </property>
@@ -57,81 +57,6 @@
    <item row="1" column="0">
     <widget class="QWidget" name="widget" native="true">
      <layout class="QGridLayout" name="gridLayout">
-      <item row="7" column="1" colspan="2">
-       <widget class="QSpinBox" name="stepOver">
-        <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The amount by which the tool is laterally displaced on each cycle of the pattern, specified in percent of the tool diameter.&lt;/p&gt;&lt;p&gt;A step over of 100% results in no overlap between two different cycles.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-        <property name="minimum">
-         <number>1</number>
-        </property>
-        <property name="maximum">
-         <number>100</number>
-        </property>
-        <property name="singleStep">
-         <number>10</number>
-        </property>
-        <property name="value">
-         <number>100</number>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="boundBoxSelect_label">
-        <property name="text">
-         <string>BoundBox</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="layerMode_label">
-        <property name="text">
-         <string>Layer Mode</string>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0">
-       <widget class="QLabel" name="depthOffset_label">
-        <property name="text">
-         <string>Depth offset</string>
-        </property>
-       </widget>
-      </item>
-      <item row="9" column="1" colspan="2">
-       <widget class="Gui::InputField" name="sampleInterval" native="true">
-        <property name="unit" stdset="0">
-         <string notr="true">mm</string>
-        </property>
-       </widget>
-      </item>
-      <item row="9" column="0">
-       <widget class="QLabel" name="sampleInterval_label">
-        <property name="text">
-         <string>Sample interval</string>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="1" colspan="2">
-       <widget class="QComboBox" name="dropCutterDirSelect">
-        <item>
-         <property name="text">
-          <string>X</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Y</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="7" column="0">
-       <widget class="QLabel" name="stepOver_label">
-        <property name="text">
-         <string>Step over</string>
-        </property>
-       </widget>
-      </item>
       <item row="1" column="1" colspan="2">
        <widget class="QComboBox" name="scanType">
         <item>
@@ -160,38 +85,71 @@
         </item>
        </widget>
       </item>
-      <item row="11" column="1">
+      <item row="8" column="1" colspan="2">
+       <widget class="QSpinBox" name="stepOver">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The amount by which the tool is laterally displaced on each cycle of the pattern, specified in percent of the tool diameter.&lt;/p&gt;&lt;p&gt;A step over of 100% results in no overlap between two different cycles.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>100</number>
+        </property>
+        <property name="singleStep">
+         <number>10</number>
+        </property>
+        <property name="value">
+         <number>100</number>
+        </property>
+       </widget>
+      </item>
+      <item row="8" column="0">
+       <widget class="QLabel" name="stepOver_label">
+        <property name="text">
+         <string>Step over</string>
+        </property>
+       </widget>
+      </item>
+      <item row="10" column="0">
+       <widget class="QLabel" name="sampleInterval_label">
+        <property name="text">
+         <string>Sample interval</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="layerMode_label">
+        <property name="text">
+         <string>Layer Mode</string>
+        </property>
+       </widget>
+      </item>
+      <item row="12" column="1">
        <widget class="QCheckBox" name="optimizeEnabled">
         <property name="text">
          <string>Optimize Linear Paths</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" colspan="2">
-       <widget class="QComboBox" name="boundBoxSelect">
-        <item>
-         <property name="text">
-          <string>Stock</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>BaseBoundBox</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="12" column="1">
-       <widget class="QCheckBox" name="optimizeStepOverTransitions">
+      <item row="6" column="0">
+       <widget class="QLabel" name="dropCutterDirSelect_label">
         <property name="text">
-         <string>Optimize StepOver Transitions</string>
+         <string>Drop Cutter Direction</string>
         </property>
        </widget>
       </item>
-      <item row="6" column="1" colspan="2">
-       <widget class="Gui::InputField" name="depthOffset" native="true">
-        <property name="unit" stdset="0">
-         <string notr="true">mm</string>
+      <item row="4" column="0">
+       <widget class="QLabel" name="boundBoxExtraOffset_label">
+        <property name="text">
+         <string>BoundBox extra offset X, Y</string>
+        </property>
+       </widget>
+      </item>
+      <item row="12" column="0">
+       <widget class="QCheckBox" name="useStartPoint">
+        <property name="text">
+         <string>Use Start Point</string>
         </property>
        </widget>
       </item>
@@ -202,7 +160,21 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="1" colspan="2">
+      <item row="0" column="0">
+       <widget class="QLabel" name="boundBoxSelect_label">
+        <property name="text">
+         <string>BoundBox</string>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="1" colspan="2">
+       <widget class="Gui::InputField" name="depthOffset" native="true">
+        <property name="unit" stdset="0">
+         <string notr="true">mm</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1" colspan="2">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="Gui::InputField" name="boundBoxExtraOffsetX" native="true">
@@ -226,25 +198,84 @@
         </item>
        </layout>
       </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="dropCutterDirSelect_label">
+      <item row="10" column="1" colspan="2">
+       <widget class="Gui::InputField" name="sampleInterval" native="true">
+        <property name="unit" stdset="0">
+         <string notr="true">mm</string>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="0">
+       <widget class="QLabel" name="depthOffset_label">
         <property name="text">
-         <string>Drop Cutter Direction</string>
+         <string>Depth offset</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1" colspan="2">
+       <widget class="QComboBox" name="dropCutterDirSelect">
+        <item>
+         <property name="text">
+          <string>X</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Y</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="0" column="1" colspan="2">
+       <widget class="QComboBox" name="boundBoxSelect">
+        <item>
+         <property name="text">
+          <string>Stock</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>BaseBoundBox</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="13" column="1">
+       <widget class="QCheckBox" name="optimizeStepOverTransitions">
+        <property name="text">
+         <string>Optimize StepOver Transitions</string>
         </property>
        </widget>
       </item>
       <item row="3" column="0">
-       <widget class="QLabel" name="boundBoxExtraOffset_label">
+       <widget class="QLabel" name="cutPattern_label">
         <property name="text">
-         <string>BoundBox extra offset X, Y</string>
+         <string>Cut Pattern</string>
         </property>
        </widget>
       </item>
-      <item row="11" column="0">
-       <widget class="QCheckBox" name="useStartPoint">
-        <property name="text">
-         <string>Use Start Point</string>
-        </property>
+      <item row="3" column="1" colspan="2">
+       <widget class="QComboBox" name="cutPattern">
+        <item>
+         <property name="text">
+          <string>Line</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>ZigZag</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Circular</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>CircularZigZag</string>
+         </property>
+        </item>
        </widget>
       </item>
      </layout>
diff --git a/src/Mod/Path/PathScripts/PathSurfaceGui.py b/src/Mod/Path/PathScripts/PathSurfaceGui.py
index 5709c0341e..1eaca56e4f 100644
--- a/src/Mod/Path/PathScripts/PathSurfaceGui.py
+++ b/src/Mod/Path/PathScripts/PathSurfaceGui.py
@@ -67,6 +67,9 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
         if obj.LayerMode != str(self.form.layerMode.currentText()):
             obj.LayerMode = str(self.form.layerMode.currentText())
 
+        if obj.CutPattern != str(self.form.cutPattern.currentText()):
+            obj.CutPattern = str(self.form.cutPattern.currentText())
+
         obj.DropCutterExtraOffset.x = FreeCAD.Units.Quantity(self.form.boundBoxExtraOffsetX.text()).Value
         obj.DropCutterExtraOffset.y = FreeCAD.Units.Quantity(self.form.boundBoxExtraOffsetY.text()).Value
 
@@ -92,6 +95,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
         self.selectInComboBox(obj.BoundBox, self.form.boundBoxSelect)
         self.selectInComboBox(obj.ScanType, self.form.scanType)
         self.selectInComboBox(obj.LayerMode, self.form.layerMode)
+        self.selectInComboBox(obj.CutPattern, self.form.cutPattern)
         self.form.boundBoxExtraOffsetX.setText(str(obj.DropCutterExtraOffset.x))
         self.form.boundBoxExtraOffsetY.setText(str(obj.DropCutterExtraOffset.y))
         self.selectInComboBox(obj.DropCutterDir, self.form.dropCutterDirSelect)
@@ -122,6 +126,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
         signals.append(self.form.boundBoxSelect.currentIndexChanged)
         signals.append(self.form.scanType.currentIndexChanged)
         signals.append(self.form.layerMode.currentIndexChanged)
+        signals.append(self.form.cutPattern.currentIndexChanged)
         signals.append(self.form.boundBoxExtraOffsetX.editingFinished)
         signals.append(self.form.boundBoxExtraOffsetY.editingFinished)
         signals.append(self.form.dropCutterDirSelect.currentIndexChanged)
@@ -136,10 +141,12 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
 
     def updateVisibility(self):
         if self.form.scanType.currentText() == "Planar":
+            self.form.cutPattern.setEnabled(True)
             self.form.boundBoxExtraOffsetX.setEnabled(False)
             self.form.boundBoxExtraOffsetY.setEnabled(False)
             self.form.dropCutterDirSelect.setEnabled(False)
         else:
+            self.form.cutPattern.setEnabled(False)
             self.form.boundBoxExtraOffsetX.setEnabled(True)
             self.form.boundBoxExtraOffsetY.setEnabled(True)
             self.form.dropCutterDirSelect.setEnabled(True)