diff --git a/src/Mod/Path/PathScripts/PathIconViewProvider.py b/src/Mod/Path/PathScripts/PathIconViewProvider.py
index 88713a7096..15ce108e73 100644
--- a/src/Mod/Path/PathScripts/PathIconViewProvider.py
+++ b/src/Mod/Path/PathScripts/PathIconViewProvider.py
@@ -75,7 +75,9 @@ class ViewProvider(object):
             callback(self.obj, self.vobj, edit)
 
     def setEdit(self, vobj, mode=0):
-        self._onEditCallback(True)
+        if 0 == mode:
+            self._onEditCallback(True)
+        return True
 
     def unsetEdit(self, arg1, arg2):
         self._onEditCallback(False)
diff --git a/src/Mod/Path/PathScripts/PathJobGui.py b/src/Mod/Path/PathScripts/PathJobGui.py
index a573cabcc0..4ce7d67871 100644
--- a/src/Mod/Path/PathScripts/PathJobGui.py
+++ b/src/Mod/Path/PathScripts/PathJobGui.py
@@ -165,7 +165,7 @@ class ViewProvider:
             PathLog.info("Expected a specific object to edit - %s not recognized" % obj.Label)
         return self.openTaskPanel()
 
-    def uneditObject(self):
+    def uneditObject(self, obj = None):
         self.unsetEdit(None, None)
 
     def getIcon(self):
@@ -1157,7 +1157,7 @@ class TaskPanel:
         self.updateSelection()
 
         # set active page
-        if activate in ['General', 'Base']:
+        if activate in ['General', 'Model']:
             self.form.setCurrentIndex(0)
         if activate in ['Output', 'Post Processor']:
             self.form.setCurrentIndex(1)