diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui
index e39c46b7bc..926b9effde 100644
--- a/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>368</width>
-    <height>442</height>
+    <width>420</width>
+    <height>541</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -366,6 +366,19 @@
         </property>
        </widget>
       </item>
+      <item row="15" column="0">
+       <widget class="QCheckBox" name="boundaryEnforcement">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If true, the cutter will remain inside the boundaries of the model or selected face(s)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="text">
+         <string>Boundary Enforcement</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/src/Mod/Path/PathScripts/PathSurfaceGui.py b/src/Mod/Path/PathScripts/PathSurfaceGui.py
index 0472885c20..bd428b90c7 100644
--- a/src/Mod/Path/PathScripts/PathSurfaceGui.py
+++ b/src/Mod/Path/PathScripts/PathSurfaceGui.py
@@ -102,6 +102,9 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
         if obj.UseStartPoint != self.form.useStartPoint.isChecked():
             obj.UseStartPoint = self.form.useStartPoint.isChecked()
 
+        if obj.BoundaryEnforcement != self.form.boundaryEnforcement.isChecked():
+            obj.BoundaryEnforcement = self.form.boundaryEnforcement.isChecked()
+
         if obj.OptimizeLinearPaths != self.form.optimizeEnabled.isChecked():
             obj.OptimizeLinearPaths = self.form.optimizeEnabled.isChecked()
 
@@ -144,6 +147,11 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
         else:
             self.form.useStartPoint.setCheckState(QtCore.Qt.Unchecked)
 
+        if obj.BoundaryEnforcement:
+            self.form.boundaryEnforcement.setCheckState(QtCore.Qt.Checked)
+        else:
+            self.form.boundaryEnforcement.setCheckState(QtCore.Qt.Unchecked)
+
         if obj.OptimizeLinearPaths:
             self.form.optimizeEnabled.setCheckState(QtCore.Qt.Checked)
         else:
@@ -174,6 +182,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
         signals.append(self.form.stepOver.editingFinished)
         signals.append(self.form.sampleInterval.editingFinished)
         signals.append(self.form.useStartPoint.stateChanged)
+        signals.append(self.form.boundaryEnforcement.stateChanged)
         signals.append(self.form.optimizeEnabled.stateChanged)
         signals.append(self.form.optimizeStepOverTransitions.stateChanged)