diff --git a/src/Mod/PartDesign/Gui/TaskBooleanParameters.ui b/src/Mod/PartDesign/Gui/TaskBooleanParameters.ui
index 954635e07c..7f959dea70 100644
--- a/src/Mod/PartDesign/Gui/TaskBooleanParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskBooleanParameters.ui
@@ -62,6 +62,12 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>buttonBodyAdd</tabstop>
+  <tabstop>buttonBodyRemove</tabstop>
+  <tabstop>listWidgetBodies</tabstop>
+  <tabstop>comboType</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/Mod/PartDesign/Gui/TaskChamferParameters.ui b/src/Mod/PartDesign/Gui/TaskChamferParameters.ui
index aff84ea890..1035f3c36b 100644
--- a/src/Mod/PartDesign/Gui/TaskChamferParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskChamferParameters.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>263</width>
-    <height>240</height>
+    <height>254</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -213,6 +213,16 @@ click again to end selection</string>
    <header>Gui/QuantitySpinBox.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>buttonRefSel</tabstop>
+  <tabstop>listWidgetReferences</tabstop>
+  <tabstop>chamferType</tabstop>
+  <tabstop>flipDirection</tabstop>
+  <tabstop>chamferSize</tabstop>
+  <tabstop>checkBoxUseAllEdges</tabstop>
+  <tabstop>chamferSize2</tabstop>
+  <tabstop>chamferAngle</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>
diff --git a/src/Mod/PartDesign/Gui/TaskDraftParameters.ui b/src/Mod/PartDesign/Gui/TaskDraftParameters.ui
index e306168d67..f89f8e7318 100644
--- a/src/Mod/PartDesign/Gui/TaskDraftParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskDraftParameters.ui
@@ -15,7 +15,6 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-
     <widget class="QToolButton" name="buttonRefSel">
      <property name="toolTip">
       <string>Click button to enter selection mode,
@@ -115,6 +114,7 @@ click again to end selection</string>
     </widget>
    </item>
   </layout>
+  <zorder>buttonRefSel</zorder>
   <zorder>checkReverse</zorder>
   <zorder>listWidgetReferences</zorder>
  </widget>
@@ -125,6 +125,16 @@ click again to end selection</string>
    <header>Gui/QuantitySpinBox.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>buttonRefSel</tabstop>
+  <tabstop>listWidgetReferences</tabstop>
+  <tabstop>draftAngle</tabstop>
+  <tabstop>buttonPlane</tabstop>
+  <tabstop>linePlane</tabstop>
+  <tabstop>buttonLine</tabstop>
+  <tabstop>lineLine</tabstop>
+  <tabstop>checkReverse</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/Mod/PartDesign/Gui/TaskFilletParameters.ui b/src/Mod/PartDesign/Gui/TaskFilletParameters.ui
index 8b6fb663ff..e4f78459b6 100644
--- a/src/Mod/PartDesign/Gui/TaskFilletParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskFilletParameters.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>208</width>
-    <height>164</height>
+    <width>232</width>
+    <height>181</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -73,6 +73,12 @@ click again to end selection</string>
    <header>Gui/QuantitySpinBox.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>buttonRefSel</tabstop>
+  <tabstop>listWidgetReferences</tabstop>
+  <tabstop>filletRadius</tabstop>
+  <tabstop>checkBoxUseAllEdges</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/Mod/PartDesign/Gui/TaskHelixParameters.ui b/src/Mod/PartDesign/Gui/TaskHelixParameters.ui
index 4ad8675a0c..7777f45b81 100644
--- a/src/Mod/PartDesign/Gui/TaskHelixParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskHelixParameters.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>278</width>
-    <height>330</height>
+    <height>398</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -302,6 +302,19 @@
    <header>Gui/QuantitySpinBox.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>axis</tabstop>
+  <tabstop>inputMode</tabstop>
+  <tabstop>pitch</tabstop>
+  <tabstop>height</tabstop>
+  <tabstop>turns</tabstop>
+  <tabstop>coneAngle</tabstop>
+  <tabstop>growth</tabstop>
+  <tabstop>checkBoxLeftHanded</tabstop>
+  <tabstop>checkBoxReversed</tabstop>
+  <tabstop>checkBoxOutside</tabstop>
+  <tabstop>checkBoxUpdateView</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.ui b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.ui
index 3f9c0eb773..751eccc4b0 100644
--- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.ui
@@ -143,6 +143,17 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>buttonAddFeature</tabstop>
+  <tabstop>buttonRemoveFeature</tabstop>
+  <tabstop>listWidgetFeatures</tabstop>
+  <tabstop>comboDirection</tabstop>
+  <tabstop>checkReverse</tabstop>
+  <tabstop>spinLength</tabstop>
+  <tabstop>spinOccurrences</tabstop>
+  <tabstop>buttonOK</tabstop>
+  <tabstop>checkBoxUpdateView</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>
diff --git a/src/Mod/PartDesign/Gui/TaskLoftParameters.ui b/src/Mod/PartDesign/Gui/TaskLoftParameters.ui
index 8e0d0b3fa6..22dd542441 100644
--- a/src/Mod/PartDesign/Gui/TaskLoftParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskLoftParameters.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>262</width>
-    <height>270</height>
+    <height>293</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -126,6 +126,16 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>checkBoxRuled</tabstop>
+  <tabstop>checkBoxClosed</tabstop>
+  <tabstop>buttonProfileBase</tabstop>
+  <tabstop>profileBaseEdit</tabstop>
+  <tabstop>buttonRefAdd</tabstop>
+  <tabstop>buttonRefRemove</tabstop>
+  <tabstop>listWidgetReferences</tabstop>
+  <tabstop>checkBoxUpdateView</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.ui b/src/Mod/PartDesign/Gui/TaskMirroredParameters.ui
index f37573dda2..f05010f94b 100644
--- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.ui
@@ -85,6 +85,14 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>buttonAddFeature</tabstop>
+  <tabstop>buttonRemoveFeature</tabstop>
+  <tabstop>listWidgetFeatures</tabstop>
+  <tabstop>comboPlane</tabstop>
+  <tabstop>buttonOK</tabstop>
+  <tabstop>checkBoxUpdateView</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>
diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.ui b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.ui
index 8aca6273e7..35a814050e 100644
--- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.ui
@@ -77,6 +77,13 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>buttonAddFeature</tabstop>
+  <tabstop>buttonRemoveFeature</tabstop>
+  <tabstop>listWidgetFeatures</tabstop>
+  <tabstop>listTransformFeatures</tabstop>
+  <tabstop>checkBoxUpdateView</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>
diff --git a/src/Mod/PartDesign/Gui/TaskPadPocketParameters.ui b/src/Mod/PartDesign/Gui/TaskPadPocketParameters.ui
index b3ebfc164e..a61989fa12 100644
--- a/src/Mod/PartDesign/Gui/TaskPadPocketParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskPadPocketParameters.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>300</width>
-    <height>490</height>
+    <height>598</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -401,17 +401,19 @@ measured along the specified direction</string>
   <tabstop>lengthEdit</tabstop>
   <tabstop>offsetEdit</tabstop>
   <tabstop>directionCB</tabstop>
-  <tabstop>checkBoxAlongDirection</tabstop>
-  <tabstop>checkBoxMidplane</tabstop>
-  <tabstop>checkBoxReversed</tabstop>
-  <tabstop>lengthEdit2</tabstop>
-  <tabstop>buttonFace</tabstop>
-  <tabstop>lineFaceName</tabstop>
-  <tabstop>checkBoxUpdateView</tabstop>
   <tabstop>checkBoxDirection</tabstop>
   <tabstop>XDirectionEdit</tabstop>
   <tabstop>YDirectionEdit</tabstop>
   <tabstop>ZDirectionEdit</tabstop>
+  <tabstop>checkBoxAlongDirection</tabstop>
+  <tabstop>checkBoxMidplane</tabstop>
+  <tabstop>checkBoxReversed</tabstop>
+  <tabstop>taperEdit</tabstop>
+  <tabstop>lengthEdit2</tabstop>
+  <tabstop>taperEdit2</tabstop>
+  <tabstop>buttonFace</tabstop>
+  <tabstop>lineFaceName</tabstop>
+  <tabstop>checkBoxUpdateView</tabstop>
  </tabstops>
  <resources/>
  <connections/>
diff --git a/src/Mod/PartDesign/Gui/TaskPipeParameters.ui b/src/Mod/PartDesign/Gui/TaskPipeParameters.ui
index b2d49fd60e..93bd89c6a5 100644
--- a/src/Mod/PartDesign/Gui/TaskPipeParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskPipeParameters.ui
@@ -152,6 +152,16 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>buttonProfileBase</tabstop>
+  <tabstop>profileBaseEdit</tabstop>
+  <tabstop>comboBoxTransition</tabstop>
+  <tabstop>buttonSpineBase</tabstop>
+  <tabstop>spineBaseEdit</tabstop>
+  <tabstop>buttonRefAdd</tabstop>
+  <tabstop>buttonRefRemove</tabstop>
+  <tabstop>listWidgetReferences</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.ui b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.ui
index 772a5d862b..9e26831d5a 100644
--- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.ui
@@ -149,6 +149,17 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>buttonAddFeature</tabstop>
+  <tabstop>buttonRemoveFeature</tabstop>
+  <tabstop>listWidgetFeatures</tabstop>
+  <tabstop>comboAxis</tabstop>
+  <tabstop>checkReverse</tabstop>
+  <tabstop>polarAngle</tabstop>
+  <tabstop>spinOccurrences</tabstop>
+  <tabstop>buttonOK</tabstop>
+  <tabstop>checkBoxUpdateView</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>
diff --git a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.ui b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.ui
index 3fbebd6f6b..1ee323292e 100644
--- a/src/Mod/PartDesign/Gui/TaskRevolutionParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskRevolutionParameters.ui
@@ -135,6 +135,13 @@
    <header>Gui/QuantitySpinBox.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>axis</tabstop>
+  <tabstop>revolveAngle</tabstop>
+  <tabstop>checkBoxMidplane</tabstop>
+  <tabstop>checkBoxReversed</tabstop>
+  <tabstop>checkBoxUpdateView</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.ui b/src/Mod/PartDesign/Gui/TaskScaledParameters.ui
index e81e301b42..6c6f6bb68f 100644
--- a/src/Mod/PartDesign/Gui/TaskScaledParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.ui
@@ -118,10 +118,19 @@
   <customwidget>
    <class>Gui::UIntSpinBox</class>
    <extends>QSpinBox</extends>
-   <header location="global">Gui/SpinBox.h</header>
+   <header>Gui/SpinBox.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>buttonAddFeature</tabstop>
+  <tabstop>buttonRemoveFeature</tabstop>
+  <tabstop>listWidgetFeatures</tabstop>
+  <tabstop>spinFactor</tabstop>
+  <tabstop>spinOccurrences</tabstop>
+  <tabstop>buttonOK</tabstop>
+  <tabstop>checkBoxUpdateView</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/Mod/PartDesign/Gui/TaskShapeBinder.ui b/src/Mod/PartDesign/Gui/TaskShapeBinder.ui
index 74f20ef539..ade246ccd0 100644
--- a/src/Mod/PartDesign/Gui/TaskShapeBinder.ui
+++ b/src/Mod/PartDesign/Gui/TaskShapeBinder.ui
@@ -78,6 +78,13 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>buttonBase</tabstop>
+  <tabstop>baseEdit</tabstop>
+  <tabstop>buttonRefAdd</tabstop>
+  <tabstop>buttonRefRemove</tabstop>
+  <tabstop>listWidgetReferences</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/Mod/PartDesign/Gui/TaskThicknessParameters.ui b/src/Mod/PartDesign/Gui/TaskThicknessParameters.ui
index 197f0bc2cf..5db93786c9 100644
--- a/src/Mod/PartDesign/Gui/TaskThicknessParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskThicknessParameters.ui
@@ -143,14 +143,13 @@ click again to end selection</string>
   </customwidget>
  </customwidgets>
  <tabstops>
+  <tabstop>buttonRefSel</tabstop>
+  <tabstop>listWidgetReferences</tabstop>
   <tabstop>Value</tabstop>
   <tabstop>modeComboBox</tabstop>
   <tabstop>joinComboBox</tabstop>
   <tabstop>checkIntersection</tabstop>
   <tabstop>checkReverse</tabstop>
-  <tabstop>buttonRefAdd</tabstop>
-  <tabstop>buttonRefRemove</tabstop>
-  <tabstop>listWidgetReferences</tabstop>
  </tabstops>
  <resources/>
  <connections/>