diff --git a/src/frontends/qt4/ui/PrefCompletionUi.ui b/src/frontends/qt4/ui/PrefCompletionUi.ui
index 8e311a0573..951e985e75 100644
--- a/src/frontends/qt4/ui/PrefCompletionUi.ui
+++ b/src/frontends/qt4/ui/PrefCompletionUi.ui
@@ -260,6 +260,14 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>inlineTextCB</tabstop>
+  <tabstop>popupTextCB</tabstop>
+  <tabstop>cursorTextCB</tabstop>
+  <tabstop>inlineMathCB</tabstop>
+  <tabstop>popupMathCB</tabstop>
+  <tabstop>autocorrectionCB</tabstop>
+ </tabstops>
  <includes>
   <include location="local" >qt_i18n.h</include>
  </includes>
diff --git a/src/frontends/qt4/ui/PrefEditUi.ui b/src/frontends/qt4/ui/PrefEditUi.ui
index a17a274143..73fb2016ed 100644
--- a/src/frontends/qt4/ui/PrefEditUi.ui
+++ b/src/frontends/qt4/ui/PrefEditUi.ui
@@ -258,7 +258,9 @@
  <layoutdefault spacing="4" margin="9" />
  <tabstops>
   <tabstop>cursorFollowsCB</tabstop>
+  <tabstop>cursorWidthSB</tabstop>
   <tabstop>scrollBelowCB</tabstop>
+  <tabstop>macLikeWordMovementCB</tabstop>
   <tabstop>sortEnvironmentsCB</tabstop>
   <tabstop>groupEnvironmentsCB</tabstop>
   <tabstop>macroEditStyleCO</tabstop>
diff --git a/src/frontends/qt4/ui/PrefFileformatsUi.ui b/src/frontends/qt4/ui/PrefFileformatsUi.ui
index f62dcdf0dc..62437bfdb5 100644
--- a/src/frontends/qt4/ui/PrefFileformatsUi.ui
+++ b/src/frontends/qt4/ui/PrefFileformatsUi.ui
@@ -230,11 +230,14 @@
   <tabstop>formatNewPB</tabstop>
   <tabstop>formatRemovePB</tabstop>
   <tabstop>documentCB</tabstop>
+  <tabstop>exportMenuCB</tabstop>
   <tabstop>vectorCB</tabstop>
   <tabstop>formatED</tabstop>
   <tabstop>extensionED</tabstop>
   <tabstop>shortcutED</tabstop>
+  <tabstop>editorCO</tabstop>
   <tabstop>editorED</tabstop>
+  <tabstop>viewerCO</tabstop>
   <tabstop>viewerED</tabstop>
   <tabstop>copierED</tabstop>
  </tabstops>
diff --git a/src/frontends/qt4/ui/PrefLanguageUi.ui b/src/frontends/qt4/ui/PrefLanguageUi.ui
index 210dcc5fb9..89b68267de 100644
--- a/src/frontends/qt4/ui/PrefLanguageUi.ui
+++ b/src/frontends/qt4/ui/PrefLanguageUi.ui
@@ -292,6 +292,7 @@
  </widget>
  <tabstops>
   <tabstop>uiLanguageCO</tabstop>
+  <tabstop>languagePackageCO</tabstop>
   <tabstop>languagePackageED</tabstop>
   <tabstop>startCommandED</tabstop>
   <tabstop>endCommandED</tabstop>
diff --git a/src/frontends/qt4/ui/PrefPathsUi.ui b/src/frontends/qt4/ui/PrefPathsUi.ui
index b1792c5328..927c75c79f 100644
--- a/src/frontends/qt4/ui/PrefPathsUi.ui
+++ b/src/frontends/qt4/ui/PrefPathsUi.ui
@@ -260,12 +260,20 @@
   <tabstop>workingDirPB</tabstop>
   <tabstop>templateDirED</tabstop>
   <tabstop>templateDirPB</tabstop>
+  <tabstop>exampleDirED</tabstop>
+  <tabstop>exampleDirPB</tabstop>
   <tabstop>backupDirED</tabstop>
   <tabstop>backupDirPB</tabstop>
   <tabstop>lyxserverDirED</tabstop>
   <tabstop>lyxserverDirPB</tabstop>
   <tabstop>tempDirED</tabstop>
   <tabstop>tempDirPB</tabstop>
+  <tabstop>thesaurusDirED</tabstop>
+  <tabstop>thesaurusDirPB</tabstop>
+  <tabstop>hunspellDirED</tabstop>
+  <tabstop>hunspellDirPB</tabstop>
+  <tabstop>pathPrefixED</tabstop>
+  <tabstop>texinputsPrefixED</tabstop>
  </tabstops>
  <includes>
   <include location="local" >qt_i18n.h</include>
diff --git a/src/frontends/qt4/ui/PrefSpellcheckerUi.ui b/src/frontends/qt4/ui/PrefSpellcheckerUi.ui
index 7b594dcf06..6fb4ac28ba 100644
--- a/src/frontends/qt4/ui/PrefSpellcheckerUi.ui
+++ b/src/frontends/qt4/ui/PrefSpellcheckerUi.ui
@@ -51,7 +51,7 @@
       <string>&amp;Spellchecker engine:</string>
      </property>
      <property name="buddy" >
-      <cstring>altLanguageED</cstring>
+      <cstring>spellcheckerCB</cstring>
      </property>
     </widget>
    </item>
@@ -131,9 +131,12 @@
   </layout>
  </widget>
  <tabstops>
+  <tabstop>spellcheckerCB</tabstop>
   <tabstop>altLanguageED</tabstop>
   <tabstop>escapeCharactersED</tabstop>
   <tabstop>compoundWordCB</tabstop>
+  <tabstop>spellcheckContinuouslyCB</tabstop>
+  <tabstop>spellcheckNotesCB</tabstop>
  </tabstops>
  <includes>
   <include location="local" >qt_i18n.h</include>
diff --git a/src/frontends/qt4/ui/PrefUi.ui b/src/frontends/qt4/ui/PrefUi.ui
index 76898fb8fd..fe50bcf0c6 100644
--- a/src/frontends/qt4/ui/PrefUi.ui
+++ b/src/frontends/qt4/ui/PrefUi.ui
@@ -298,12 +298,16 @@
  <tabstops>
   <tabstop>uiFileED</tabstop>
   <tabstop>uiFilePB</tabstop>
+  <tabstop>iconSetCO</tabstop>
   <tabstop>tooltipCB</tabstop>
-  <tabstop>restoreCursorCB</tabstop>
   <tabstop>allowGeometrySessionCB</tabstop>
+  <tabstop>restoreCursorCB</tabstop>
   <tabstop>loadSessionCB</tabstop>
+  <tabstop>clearSessionPB</tabstop>
+  <tabstop>backupCB</tabstop>
   <tabstop>autoSaveCB</tabstop>
   <tabstop>autoSaveSB</tabstop>
+  <tabstop>saveCompressedCB</tabstop>
   <tabstop>lastfilesSB</tabstop>
   <tabstop>openDocumentsInTabsCB</tabstop>
  </tabstops>
diff --git a/status.20x b/status.20x
index 3d79c1b348..25d6a59ea5 100644
--- a/status.20x
+++ b/status.20x
@@ -107,6 +107,8 @@ What's new
 - Fix on-screen display of graphics when the name of the temporary directory
   contains non-ascii characters (bug 7621).
 
+- Fix the tab ordering of widgets in the Tools > Preferences panel.
+
 
 * ADVANCED FIND AND REPLACE