diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py
index a5f52576c..06cffa472 100644
--- a/src/Mod/Draft/DraftTools.py
+++ b/src/Mod/Draft/DraftTools.py
@@ -231,6 +231,17 @@ class SelectPlane:
         self.call = None
         self.doc = FreeCAD.ActiveDocument
         if self.doc:
+            sel = FreeCADGui.Selection.getSelectionEx()
+            if len(sel) == 1:
+                sel = sel[0]
+                if sel.HasSubObjects:
+                    if len(sel.SubElementNames) == 1:
+                        if "Face" in sel.SubElementNames[0]:
+                            self.ui = FreeCADGui.draftToolBar
+                            plane.alignToFace(sel.SubObjects[0], self.offset)
+                            self.display(plane.axis)
+                            self.finish()
+                            return
             FreeCAD.activeDraftCommand = self
             self.view = Draft.get3DView()
             self.ui = FreeCADGui.draftToolBar
diff --git a/src/Mod/Draft/DraftTrackers.py b/src/Mod/Draft/DraftTrackers.py
index 5223ebf66..ab556e095 100644
--- a/src/Mod/Draft/DraftTrackers.py
+++ b/src/Mod/Draft/DraftTrackers.py
@@ -617,7 +617,9 @@ class gridTracker(Tracker):
 
     def set(self):
         Q = FreeCAD.DraftWorkingPlane.getRotation().Rotation.Q
+        P = FreeCAD.DraftWorkingPlane.position
         self.trans.rotation.setValue([Q[0],Q[1],Q[2],Q[3]])
+        self.trans.translation.setValue([P.x,P.y,P.z])
         self.on()
 
     def getClosestNode(self,point):