diff --git a/src/Mod/Path/PathScripts/PathOp.py b/src/Mod/Path/PathScripts/PathOp.py
index 10a928949d..bafbff7f5f 100644
--- a/src/Mod/Path/PathScripts/PathOp.py
+++ b/src/Mod/Path/PathScripts/PathOp.py
@@ -258,6 +258,13 @@ class ObjectOp(object):
         self.stock = job.Stock
         return True
 
+    def getJob(self, obj):
+        '''getJob(obj) ... return the job this operation is part of.'''
+        if not hasattr(self, 'job'):
+            if not self._setBaseAndStock(obj):
+                return None
+        return self.job
+
     def updateDepths(self, obj, ignoreErrors=False):
         '''updateDepths(obj) ... base implementation calculating depths depending on base geometry.
         Can safely be overwritten.'''
@@ -406,10 +413,7 @@ class ObjectOp(object):
 
         if self._setBaseAndStock(obj):
             if base == self.job.Proxy.baseObject(self.job):
-                PathLog.info("this is it")
                 base = self.baseobject
-            else:
-                PathLog.info("no, base=%s job.base=%s" % (base, self.job.Proxy.baseObject(self.job)))
             baselist = obj.Base
             if baselist is None:
                 baselist = []
diff --git a/src/Mod/Path/PathScripts/PathOpGui.py b/src/Mod/Path/PathScripts/PathOpGui.py
index 2db2594dd3..9cbffa8ded 100644
--- a/src/Mod/Path/PathScripts/PathOpGui.py
+++ b/src/Mod/Path/PathScripts/PathOpGui.py
@@ -103,10 +103,18 @@ class ViewProvider(object):
         FreeCADGui.Control.closeDialog()
         FreeCADGui.Control.showDialog(panel)
         panel.setupUi()
+        job = self.Object.Proxy.getJob(self.Object)
+        if job:
+            job.ViewObject.Proxy.setupEditVisibility(job)
+        else:
+            PathLog.info("did not find no job")
 
     def clearTaskPanel(self):
         '''clearTaskPanel() ... internal callback function when editing has finished.'''
         self.panel = None
+        job = self.Object.Proxy.getJob(self.Object)
+        if job:
+            job.ViewObject.Proxy.resetEditVisibility(job)
 
     def unsetEdit(self, arg1, arg2):
         if self.panel: