diff --git a/src/Mod/PartDesign/App/FeatureChamfer.cpp b/src/Mod/PartDesign/App/FeatureChamfer.cpp
index 24c20482c1..06eee9cf15 100644
--- a/src/Mod/PartDesign/App/FeatureChamfer.cpp
+++ b/src/Mod/PartDesign/App/FeatureChamfer.cpp
@@ -115,7 +115,9 @@ App::DocumentObjectExecReturn *Chamfer::execute(void)
     }
 
     std::vector<std::string> SubNames = std::vector<std::string>(Base.getSubValues());
-    getContinuousEdges(TopShape, SubNames);
+    std::vector<std::string> FaceNames;
+  
+    getContinuousEdges(TopShape, SubNames, FaceNames);
 
     if (SubNames.size() == 0)
         return new App::DocumentObjectExecReturn("No edges specified");
@@ -138,16 +140,35 @@ App::DocumentObjectExecReturn *Chamfer::execute(void)
     try {
         BRepFilletAPI_MakeChamfer mkChamfer(baseShape.getShape());
 
-        TopTools_IndexedMapOfShape mapOfEdges;
         TopTools_IndexedDataMapOfShapeListOfShape mapEdgeFace;
         TopExp::MapShapesAndAncestors(baseShape.getShape(), TopAbs_EDGE, TopAbs_FACE, mapEdgeFace);
-        TopExp::MapShapes(baseShape.getShape(), TopAbs_EDGE, mapOfEdges);
 
-        for (std::vector<std::string>::const_iterator it=SubNames.begin(); it != SubNames.end(); ++it) {
-            TopoDS_Edge edge = TopoDS::Edge(baseShape.getSubShape(it->c_str()));
-            const TopoDS_Face& face = (chamferType != 0 && flipDirection) ?
-                TopoDS::Face(mapEdgeFace.FindFromKey(edge).Last()) :
-                TopoDS::Face(mapEdgeFace.FindFromKey(edge).First());
+        for (const auto &itSN : SubNames) {
+            TopoDS_Edge edge = TopoDS::Edge(baseShape.getSubShape(itSN.c_str()));
+
+            const TopoDS_Shape& faceLast = mapEdgeFace.FindFromKey(edge).Last();
+            const TopoDS_Shape& faceFirst = mapEdgeFace.FindFromKey(edge).First();
+
+            // Set the face based on flipDirection for all edges by default. Note for chamferType==0 it does not matter which face is used.
+            TopoDS_Face face = TopoDS::Face( flipDirection ? faceLast : faceFirst );
+    
+            // for chamfer types otherthan Equal (type = 0) check if one of the faces associated with the edge
+            // is one of the originally selected faces. If so use the other face by default or the selected face if "flipDirection" is set
+            if (chamferType != 0) {
+
+                // for each selected face
+                for (const auto &itFN : FaceNames) {
+                    const TopoDS_Shape selFace = baseShape.getSubShape(itFN.c_str());
+
+                    if ( faceLast.IsEqual(selFace) ) 
+                        face = TopoDS::Face( flipDirection ? faceFirst : faceLast );
+                    
+                    else if ( faceFirst.IsEqual(selFace) ) 
+                        face = TopoDS::Face( flipDirection ? faceLast : faceFirst );
+                }
+
+            } 
+
             switch (chamferType) {
                 case 0: // Equal distance
                     mkChamfer.Add(size, size, edge, face);
diff --git a/src/Mod/PartDesign/App/FeatureDressUp.cpp b/src/Mod/PartDesign/App/FeatureDressUp.cpp
index 67daa010d1..430eac64ba 100644
--- a/src/Mod/PartDesign/App/FeatureDressUp.cpp
+++ b/src/Mod/PartDesign/App/FeatureDressUp.cpp
@@ -99,6 +99,13 @@ Part::Feature *DressUp::getBaseObject(bool silent) const
 
 void DressUp::getContinuousEdges(Part::TopoShape TopShape, std::vector< std::string >& SubNames) {
 
+    std::vector< std::string > FaceNames;
+
+    getContinuousEdges(TopShape, SubNames, FaceNames);
+}
+
+void DressUp::getContinuousEdges(Part::TopoShape TopShape, std::vector< std::string >& SubNames, std::vector< std::string >& FaceNames) {
+
     TopTools_IndexedMapOfShape mapOfEdges;
     TopTools_IndexedDataMapOfShapeListOfShape mapEdgeFace;
     TopExp::MapShapesAndAncestors(TopShape.getShape(), TopAbs_EDGE, TopAbs_FACE, mapEdgeFace);
@@ -153,6 +160,7 @@ void DressUp::getContinuousEdges(Part::TopoShape TopShape, std::vector< std::str
 
             }
 
+            FaceNames.push_back(aSubName.c_str());
             SubNames.erase(SubNames.begin()+i);
         }
         // empty name or any other sub-element
diff --git a/src/Mod/PartDesign/App/FeatureDressUp.h b/src/Mod/PartDesign/App/FeatureDressUp.h
index 61831ee8e8..1a590ba26b 100644
--- a/src/Mod/PartDesign/App/FeatureDressUp.h
+++ b/src/Mod/PartDesign/App/FeatureDressUp.h
@@ -59,6 +59,8 @@ public:
     /// extracts all edges from the subshapes (including face edges) and furthermore adds
     /// all C0 continuous edges to the vector
     void getContinuousEdges(Part::TopoShape, std::vector< std::string >&);
+    // add argument to return the selected face that edges were derived from
+    void getContinuousEdges(Part::TopoShape, std::vector< std::string >&, std::vector< std::string >&);
 
     virtual void getAddSubShape(Part::TopoShape &addShape, Part::TopoShape &subShape);