diff --git a/src/Mod/PartDesign/App/FeatureSketchBased.cpp b/src/Mod/PartDesign/App/FeatureSketchBased.cpp
index 1fc4af3fb..23977fcd8 100644
--- a/src/Mod/PartDesign/App/FeatureSketchBased.cpp
+++ b/src/Mod/PartDesign/App/FeatureSketchBased.cpp
@@ -191,7 +191,7 @@ std::vector<TopoDS_Wire> SketchBased::getSketchWires() const {
 // this method, it becomes null!
 const TopoDS_Face SketchBased::getSupportFace() const {
     const Part::Part2DObject* sketch = getVerifiedSketch();
-    if (sketch->Support.getValue()) {
+    if (sketch->MapMode.getValue() == Attacher::mmFlatFace  &&  sketch->Support.getValue()) {
         const auto &Support = sketch->Support;
         App::DocumentObject* ref = Support.getValue();
 
diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp
index fc0fcb76e..f7f58a76b 100644
--- a/src/Mod/PartDesign/Gui/Command.cpp
+++ b/src/Mod/PartDesign/Gui/Command.cpp
@@ -784,7 +784,7 @@ void CmdPartDesignNewSketch::activated(int iMsg)
         } else {
             obj = static_cast<Part::Feature*>(PlaneFilter.Result[0][0].getObject());
             // TODO: Find out whether the user picked front or back of this plane
-            supportString = std::string("(App.activeDocument().") + obj->getNameInDocument() + ", ['front'])";
+            supportString = std::string("(App.activeDocument().") + obj->getNameInDocument() + ", '')";
         }
 
         if (!pcActiveBody->hasFeature(obj)) {