diff --git a/src/Mod/Path/PathScripts/PathSurface.py b/src/Mod/Path/PathScripts/PathSurface.py
index d73fe6102e..3ddda100cd 100644
--- a/src/Mod/Path/PathScripts/PathSurface.py
+++ b/src/Mod/Path/PathScripts/PathSurface.py
@@ -319,9 +319,18 @@ class ObjectSurface(PathOp.ObjectOp):
             obj.OpStartDepth = d.start_depth
             obj.OpFinalDepth = d.final_depth
 
+def SetupProperties():
+    setup = []
+    setup.append("Algorithm")
+    setup.append("DropCutterDir")
+    setup.append("BoundBox")
+    setup.append("StepOver")
+    setup.append("DepthOffset")
+    return setup
 
-def Create(name):
+def Create(name, obj = None):
     '''Create(name) ... Creates and returns a Surface operation.'''
-    obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name)
+    if obj is None:
+        obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name)
     proxy = ObjectSurface(obj, name)
     return obj
diff --git a/src/Mod/Path/PathScripts/PathSurfaceGui.py b/src/Mod/Path/PathScripts/PathSurfaceGui.py
index 48e7349bfe..5fab107eac 100644
--- a/src/Mod/Path/PathScripts/PathSurfaceGui.py
+++ b/src/Mod/Path/PathScripts/PathSurfaceGui.py
@@ -65,7 +65,8 @@ Command = PathOpGui.SetupOperation('Surface',
         TaskPanelOpPage,
         'Path-3DSurface',
         QtCore.QT_TRANSLATE_NOOP("Surface", "3D Surface"),
-        QtCore.QT_TRANSLATE_NOOP("Surface", "Create a 3D Surface Operation from a model"))
+        QtCore.QT_TRANSLATE_NOOP("Surface", "Create a 3D Surface Operation from a model"),
+        PathSurface.SetupProperties)
 
 FreeCAD.Console.PrintLog("Loading PathSurfaceGui... done\n")