diff --git a/src/ui/3d/animationexport3ddialog.ui b/src/ui/3d/animationexport3ddialog.ui
index e1e31d8ba7e1..9c137cec0b7c 100644
--- a/src/ui/3d/animationexport3ddialog.ui
+++ b/src/ui/3d/animationexport3ddialog.ui
@@ -157,6 +157,7 @@
  </customwidgets>
  <tabstops>
   <tabstop>mTemplateLineEdit</tabstop>
+  <tabstop>mFpsSpinBox</tabstop>
   <tabstop>mWidthSpinBox</tabstop>
   <tabstop>mHeightSpinBox</tabstop>
  </tabstops>
diff --git a/src/ui/3d/goochmaterialwidget.ui b/src/ui/3d/goochmaterialwidget.ui
index db91962bca20..02cb34a1c418 100644
--- a/src/ui/3d/goochmaterialwidget.ui
+++ b/src/ui/3d/goochmaterialwidget.ui
@@ -163,18 +163,27 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>QgsDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>qgsdoublespinbox.h</header>
+  </customwidget>
   <customwidget>
    <class>QgsColorButton</class>
    <extends>QToolButton</extends>
    <header>qgscolorbutton.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>QgsDoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header>qgsdoublespinbox.h</header>
-  </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>btnDiffuse</tabstop>
+  <tabstop>btnWarm</tabstop>
+  <tabstop>btnCool</tabstop>
+  <tabstop>btnSpecular</tabstop>
+  <tabstop>spinShininess</tabstop>
+  <tabstop>spinAlpha</tabstop>
+  <tabstop>spinBeta</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/ui/3d/map3dconfigwidget.ui b/src/ui/3d/map3dconfigwidget.ui
index f882e74ebdbf..d89de9f395f9 100644
--- a/src/ui/3d/map3dconfigwidget.ui
+++ b/src/ui/3d/map3dconfigwidget.ui
@@ -378,17 +378,6 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>QgsDoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header>qgsdoublespinbox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>QgsPhongMaterialWidget</class>
-   <extends>QWidget</extends>
-   <header>qgsphongmaterialwidget.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>QgsCollapsibleGroupBox</class>
    <extends>QGroupBox</extends>
@@ -401,6 +390,17 @@
    <header>qgsscrollarea.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>QgsDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>qgsdoublespinbox.h</header>
+  </customwidget>
+  <customwidget>
+   <class>QgsPhongMaterialWidget</class>
+   <extends>QWidget</extends>
+   <header>qgsphongmaterialwidget.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>QgsMapLayerComboBox</class>
    <extends>QComboBox</extends>
@@ -427,6 +427,7 @@
   <tabstop>spinTerrainResolution</tabstop>
   <tabstop>spinTerrainSkirtHeight</tabstop>
   <tabstop>groupTerrainShading</tabstop>
+  <tabstop>groupSkyboxSettings</tabstop>
   <tabstop>spinMapResolution</tabstop>
   <tabstop>spinScreenError</tabstop>
   <tabstop>spinGroundError</tabstop>
@@ -434,6 +435,7 @@
   <tabstop>chkShowTileInfo</tabstop>
   <tabstop>chkShowBoundingBoxes</tabstop>
   <tabstop>chkShowCameraViewCenter</tabstop>
+  <tabstop>chkShowLightSourceOrigins</tabstop>
  </tabstops>
  <resources/>
  <connections/>
diff --git a/src/ui/3d/phongmaterialwidget.ui b/src/ui/3d/phongmaterialwidget.ui
index 136cb6b07ee5..58acf1236b77 100644
--- a/src/ui/3d/phongmaterialwidget.ui
+++ b/src/ui/3d/phongmaterialwidget.ui
@@ -112,6 +112,12 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>btnDiffuse</tabstop>
+  <tabstop>btnAmbient</tabstop>
+  <tabstop>btnSpecular</tabstop>
+  <tabstop>spinShininess</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/ui/3d/phongtexturedmaterialwidgetbase.ui b/src/ui/3d/phongtexturedmaterialwidgetbase.ui
index 3b07b1afeed1..b23f7454a5a6 100644
--- a/src/ui/3d/phongtexturedmaterialwidgetbase.ui
+++ b/src/ui/3d/phongtexturedmaterialwidgetbase.ui
@@ -137,9 +137,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>QgsColorButton</class>
-   <extends>QToolButton</extends>
-   <header>qgscolorbutton.h</header>
+   <class>QgsImageSourceLineEdit</class>
+   <extends>QWidget</extends>
+   <header>qgsfilecontentsourcelineedit.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
@@ -148,12 +148,19 @@
    <header>qgsdoublespinbox.h</header>
   </customwidget>
   <customwidget>
-   <class>QgsImageSourceLineEdit</class>
-   <extends>QWidget</extends>
-   <header>qgsfilecontentsourcelineedit.h</header>
+   <class>QgsColorButton</class>
+   <extends>QToolButton</extends>
+   <header>qgscolorbutton.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>btnAmbient</tabstop>
+  <tabstop>btnSpecular</tabstop>
+  <tabstop>spinShininess</tabstop>
+  <tabstop>textureScaleSpinBox</tabstop>
+  <tabstop>textureRotationSpinBox</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/ui/3d/qgslightswidget.ui b/src/ui/3d/qgslightswidget.ui
index c589cb051af7..d83990667d2c 100644
--- a/src/ui/3d/qgslightswidget.ui
+++ b/src/ui/3d/qgslightswidget.ui
@@ -370,6 +370,8 @@
   </customwidget>
  </customwidgets>
  <tabstops>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>cboLights</tabstop>
   <tabstop>btnAddLight</tabstop>
   <tabstop>btnRemoveLight</tabstop>
   <tabstop>spinPositionX</tabstop>
@@ -377,6 +379,17 @@
   <tabstop>spinPositionZ</tabstop>
   <tabstop>btnColor</tabstop>
   <tabstop>spinIntensity</tabstop>
+  <tabstop>spinA0</tabstop>
+  <tabstop>spinA1</tabstop>
+  <tabstop>spinA2</tabstop>
+  <tabstop>cboDirectionalLights</tabstop>
+  <tabstop>btnAddDirectionalLight</tabstop>
+  <tabstop>btnRemoveDirectionalLight</tabstop>
+  <tabstop>spinDirectionX</tabstop>
+  <tabstop>spinDirectionY</tabstop>
+  <tabstop>spinDirectionZ</tabstop>
+  <tabstop>btnDirectionalColor</tabstop>
+  <tabstop>spinDirectionalIntensity</tabstop>
  </tabstops>
  <resources/>
  <connections/>