diff --git a/src/Mod/Path/Gui/Resources/panels/PathEdit.ui b/src/Mod/Path/Gui/Resources/panels/PathEdit.ui
index 19f4482cd5..cb2ca81a9b 100644
--- a/src/Mod/Path/Gui/Resources/panels/PathEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/PathEdit.ui
@@ -31,8 +31,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>412</width>
-         <height>549</height>
+         <width>410</width>
+         <height>572</height>
         </rect>
        </property>
        <attribute name="label">
@@ -949,7 +949,11 @@
    <attribute name="title">
     <string>Op Defaults</string>
    </attribute>
-   <layout class="QVBoxLayout" name="verticalLayout_11"/>
+   <layout class="QVBoxLayout" name="verticalLayout_11">
+    <item>
+     <widget class="QComboBox" name="opDefaultOp"/>
+    </item>
+   </layout>
   </widget>
  </widget>
  <customwidgets>
@@ -972,6 +976,7 @@
   <tabstop>postProcessorSetOutputFile</tabstop>
   <tabstop>postProcessor</tabstop>
   <tabstop>postProcessorArguments</tabstop>
+  <tabstop>stock</tabstop>
   <tabstop>stockExisting</tabstop>
   <tabstop>stockExtXneg</tabstop>
   <tabstop>stockExtXpos</tabstop>
diff --git a/src/Mod/Path/PathScripts/PathJobGui.py b/src/Mod/Path/PathScripts/PathJobGui.py
index 2d03e731ab..30424126e1 100644
--- a/src/Mod/Path/PathScripts/PathJobGui.py
+++ b/src/Mod/Path/PathScripts/PathJobGui.py
@@ -491,7 +491,7 @@ class TaskPanel:
         self.stockEdit = None
 
         self.setupGlobal = PathSetupSheetGui.GlobalEditor(self.obj.SetupSheet, self.form)
-        self.setupOps = PathSetupSheetGui.OpsDefaultEditor(self.obj.SetupSheet, self.form.tabOpDefaults)
+        self.setupOps = PathSetupSheetGui.OpsDefaultEditor(self.obj.SetupSheet, self.form)
 
     def preCleanup(self):
         PathLog.track()
diff --git a/src/Mod/Path/PathScripts/PathSetupSheetGui.py b/src/Mod/Path/PathScripts/PathSetupSheetGui.py
index 7cda923cdc..7e20d80059 100644
--- a/src/Mod/Path/PathScripts/PathSetupSheetGui.py
+++ b/src/Mod/Path/PathScripts/PathSetupSheetGui.py
@@ -202,15 +202,18 @@ class OpTaskPanel:
 
 class OpsDefaultEditor:
 
-    def __init__(self, obj, parent):
+    def __init__(self, obj, form):
+        self.form = form
         self.obj = obj
         self.ops = sorted([OpTaskPanel(self.obj, name, op) for name, op in PathUtil.keyValueIter(PathSetupSheet._RegisteredOps)], key = lambda op: op.name)
-        if parent:
-            self.toolbox = QtGui.QToolBox(parent)
+        if form:
+            parent = form.tabOpDefaults
             for op in self.ops:
-                self.toolbox.addItem(op.form, op.form.windowTitle())
-            self.toolbox.setParent(parent)
-            parent.layout().addWidget(self.toolbox)
+                form.opDefaultOp.addItem(op.form.windowTitle(), op)
+                op.form.setParent(parent)
+                parent.layout().addWidget(op.form)
+                op.form.hide()
+        self.currentOp = None
 
     def reject(self):
         pass
@@ -227,7 +230,14 @@ class OpsDefaultEditor:
         pass
 
     def updateUI(self):
-        pass
+        if self.currentOp:
+            self.currentOp.form.hide()
+            self.currentOp = None
+        current = self.form.opDefaultOp.currentIndex()
+        if current < 0:
+            current = 0
+        self.currentOp = self.form.opDefaultOp.itemData(current)
+        self.currentOp.form.show()
 
     def updateModel(self, recomp = True):
         PathLog.track()
@@ -242,6 +252,8 @@ class OpsDefaultEditor:
     def setupUi(self):
         for op in self.ops:
             op.setupUi()
+        self.updateUI()
+        self.form.opDefaultOp.currentIndexChanged.connect(self.updateUI)
 
 class GlobalEditor(object):