diff --git a/src/Mod/Path/Gui/Resources/panels/PageBaseGeometryEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageBaseGeometryEdit.ui
index eb953d4a7f..6f782ae8c7 100644
--- a/src/Mod/Path/Gui/Resources/panels/PageBaseGeometryEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/PageBaseGeometryEdit.ui
@@ -67,6 +67,12 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>baseList</tabstop>
+  <tabstop>addBase</tabstop>
+  <tabstop>deleteBase</tabstop>
+  <tabstop>updateBase</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/Mod/Path/Gui/Resources/panels/PageBaseHoleGeometryEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageBaseHoleGeometryEdit.ui
index 5674f9d6f3..a6137aeb51 100644
--- a/src/Mod/Path/Gui/Resources/panels/PageBaseHoleGeometryEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/PageBaseHoleGeometryEdit.ui
@@ -83,6 +83,12 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>baseList</tabstop>
+  <tabstop>addBase</tabstop>
+  <tabstop>deleteBase</tabstop>
+  <tabstop>resetBase</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpDrillingEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpDrillingEdit.ui
index a90903ee19..c4d2e3530b 100644
--- a/src/Mod/Path/Gui/Resources/panels/PageOpDrillingEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/PageOpDrillingEdit.ui
@@ -126,6 +126,15 @@
    <header>Gui/InputField.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>toolController</tabstop>
+  <tabstop>retractHeight</tabstop>
+  <tabstop>peckEnabled</tabstop>
+  <tabstop>peckDepth</tabstop>
+  <tabstop>dwellEnabled</tabstop>
+  <tabstop>dwellTime</tabstop>
+  <tabstop>useTipLength</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpProfileFullEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpProfileFullEdit.ui
index c0c4392314..4b0611c5bd 100644
--- a/src/Mod/Path/Gui/Resources/panels/PageOpProfileFullEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/PageOpProfileFullEdit.ui
@@ -192,6 +192,17 @@
    <header>Gui/InputField.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>toolController</tabstop>
+  <tabstop>cutSide</tabstop>
+  <tabstop>direction</tabstop>
+  <tabstop>extraOffset</tabstop>
+  <tabstop>useStartPoint</tabstop>
+  <tabstop>useCompensation</tabstop>
+  <tabstop>processHoles</tabstop>
+  <tabstop>processCircles</tabstop>
+  <tabstop>processPerimeter</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>