diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
index 1e84dbce8..85c6f8385 100644
--- a/src/Mod/Draft/DraftGui.py
+++ b/src/Mod/Draft/DraftGui.py
@@ -990,7 +990,7 @@ class DraftToolBar:
     def setCurrentText(self,tstr):
         if (not self.taskmode) or (self.taskmode and self.isTaskOn):
             self.textValue.setText(tstr)
-                                                
+    
     def sendText(self):
         '''
         this function sends the entered text to the active draft command
diff --git a/src/Mod/Draft/DraftSnap.py b/src/Mod/Draft/DraftSnap.py
index ddc66e528..5a36e70ff 100644
--- a/src/Mod/Draft/DraftSnap.py
+++ b/src/Mod/Draft/DraftSnap.py
@@ -317,16 +317,16 @@ class Snapper:
         "returns a 3D point, projected on the current working plane"
         view = Draft.get3DView()
         pt = view.getPoint(x,y)
-        if hasattr(FreeCAD,"DraftWorkingPlane"):
-            if view.getCameraType() == "Perspective":
-                camera = view.getCameraNode()
-                p = camera.getField("position").getValue()
-                dv = pt.sub(Vector(p[0],p[1],p[2]))
-            else:
-                dv = view.getViewDirection()
-            return FreeCAD.DraftWorkingPlane.projectPoint(pt,dv)
-        else:
-            return pt
+        if self.mask != "z":
+            if hasattr(FreeCAD,"DraftWorkingPlane"):
+                if view.getCameraType() == "Perspective":
+                    camera = view.getCameraNode()
+                    p = camera.getField("position").getValue()
+                    dv = pt.sub(Vector(p[0],p[1],p[2]))
+                else:
+                    dv = view.getViewDirection()
+                return FreeCAD.DraftWorkingPlane.projectPoint(pt,dv)
+        return pt
         
     def snapToExtensions(self,point,last,constrain,eline):
         "returns a point snapped to extension or parallel line to last object, if any"