diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpPocketFullEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpPocketFullEdit.ui
index 00f822df6e..d1a81ae2c1 100644
--- a/src/Mod/Path/Gui/Resources/panels/PageOpPocketFullEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/PageOpPocketFullEdit.ui
@@ -255,6 +255,13 @@
         </property>
        </widget>
       </item>
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="clearEdges">
+        <property name="text">
+         <string>Clear Edges</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/src/Mod/Path/PathScripts/PathMillFace.py b/src/Mod/Path/PathScripts/PathMillFace.py
index cbb7e0d624..9fa300ef71 100644
--- a/src/Mod/Path/PathScripts/PathMillFace.py
+++ b/src/Mod/Path/PathScripts/PathMillFace.py
@@ -59,7 +59,7 @@ class ObjectFace(PathPocketBase.ObjectPocket):
         '''initPocketOp(obj) ... create facing specific properties'''
         obj.addProperty("App::PropertyEnumeration", "BoundaryShape", "Face", QtCore.QT_TRANSLATE_NOOP("App::Property", "Shape to use for calculating Boundary"))
         obj.BoundaryShape = ['Perimeter', 'Boundbox', 'Stock']
-        obj.addProperty("App::PropertyBool", "ClearEdges", "Face", QtCore.QT_TRANSLATE_NOOP("App::Property", "Clear edges"))
+        obj.addProperty("App::PropertyBool", "ClearEdges", "Face", QtCore.QT_TRANSLATE_NOOP("App::Property", "Clear edges of surface (Only applicable to BoundBox)"))
 
         if not hasattr(obj, 'ExcludeRaisedAreas'):
             obj.addProperty("App::PropertyBool", "ExcludeRaisedAreas", "Face", QtCore.QT_TRANSLATE_NOOP("App::Property", "Exclude milling raised areas inside the face."))
diff --git a/src/Mod/Path/PathScripts/PathPocketBaseGui.py b/src/Mod/Path/PathScripts/PathPocketBaseGui.py
index 809bff2dc1..ad8dda997c 100644
--- a/src/Mod/Path/PathScripts/PathPocketBaseGui.py
+++ b/src/Mod/Path/PathScripts/PathPocketBaseGui.py
@@ -62,6 +62,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
 
         if not FeatureFacing & self.pocketFeatures():
             form.facingWidget.hide()
+            form.clearEdges.hide()
 
         if FeaturePocket & self.pocketFeatures():
             form.extraOffsetLabel.setText(translate("PathPocket", "Pass Extension"))
@@ -121,6 +122,8 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
         if FeatureFacing & self.pocketFeatures():
             if obj.BoundaryShape != str(self.form.boundaryShape.currentText()):
                 obj.BoundaryShape = str(self.form.boundaryShape.currentText())
+            if obj.ClearEdges != self.form.clearEdges.isChecked():
+                obj.ClearEdges = self.form.clearEdges.isChecked()
 
     def setFields(self, obj):
         '''setFields(obj) ... transfers obj's property values to UI'''
@@ -143,6 +146,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
 
         if FeatureFacing & self.pocketFeatures():
             self.selectInComboBox(obj.BoundaryShape, self.form.boundaryShape)
+            self.form.clearEdges.setChecked(obj.ClearEdges)
 
     def getSignalsForUpdate(self, obj):
         '''getSignalsForUpdate(obj) ... return list of signals for updating obj'''
@@ -161,5 +165,6 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
 
         if FeatureFacing & self.pocketFeatures():
             signals.append(self.form.boundaryShape.currentIndexChanged)
+            signals.append(self.form.clearEdges.clicked)
 
         return signals