diff --git a/picard/ui/ui_options_general.py b/picard/ui/ui_options_general.py
index 6d7819c50..bd97f7c68 100644
--- a/picard/ui/ui_options_general.py
+++ b/picard/ui/ui_options_general.py
@@ -156,8 +156,11 @@ class Ui_GeneralOptionsPage(object):
         QtCore.QMetaObject.connectSlotsByName(GeneralOptionsPage)
         GeneralOptionsPage.setTabOrder(self.server_host, self.server_port)
         GeneralOptionsPage.setTabOrder(self.server_port, self.use_server_for_submission)
-        GeneralOptionsPage.setTabOrder(self.use_server_for_submission, self.analyze_new_files)
-        GeneralOptionsPage.setTabOrder(self.analyze_new_files, self.ignore_file_mbids)
+        GeneralOptionsPage.setTabOrder(self.use_server_for_submission, self.login)
+        GeneralOptionsPage.setTabOrder(self.login, self.logout)
+        GeneralOptionsPage.setTabOrder(self.logout, self.analyze_new_files)
+        GeneralOptionsPage.setTabOrder(self.analyze_new_files, self.cluster_new_files)
+        GeneralOptionsPage.setTabOrder(self.cluster_new_files, self.ignore_file_mbids)
         GeneralOptionsPage.setTabOrder(self.ignore_file_mbids, self.check_for_updates)
         GeneralOptionsPage.setTabOrder(self.check_for_updates, self.update_check_days)
         GeneralOptionsPage.setTabOrder(self.update_check_days, self.update_level)
diff --git a/picard/ui/ui_options_metadata.py b/picard/ui/ui_options_metadata.py
index 00666e7ed..3e324872e 100644
--- a/picard/ui/ui_options_metadata.py
+++ b/picard/ui/ui_options_metadata.py
@@ -108,8 +108,12 @@ class Ui_MetadataOptionsPage(object):
 
         self.retranslateUi(MetadataOptionsPage)
         QtCore.QMetaObject.connectSlotsByName(MetadataOptionsPage)
-        MetadataOptionsPage.setTabOrder(self.translate_artist_names, self.translate_artist_names_script_exception)
-        MetadataOptionsPage.setTabOrder(self.translate_artist_names_script_exception, self.standardize_artists)
+        MetadataOptionsPage.setTabOrder(self.translate_artist_names, self.selected_locales)
+        MetadataOptionsPage.setTabOrder(self.selected_locales, self.select_locales)
+        MetadataOptionsPage.setTabOrder(self.select_locales, self.translate_artist_names_script_exception)
+        MetadataOptionsPage.setTabOrder(self.translate_artist_names_script_exception, self.selected_scripts)
+        MetadataOptionsPage.setTabOrder(self.selected_scripts, self.select_scripts)
+        MetadataOptionsPage.setTabOrder(self.select_scripts, self.standardize_artists)
         MetadataOptionsPage.setTabOrder(self.standardize_artists, self.standardize_instruments)
         MetadataOptionsPage.setTabOrder(self.standardize_instruments, self.convert_punctuation)
         MetadataOptionsPage.setTabOrder(self.convert_punctuation, self.release_ars)
diff --git a/ui/options_general.ui b/ui/options_general.ui
index 665f28c55..1ac324dfb 100644
--- a/ui/options_general.ui
+++ b/ui/options_general.ui
@@ -306,7 +306,10 @@ QCheckBox { color: black }</string>
   <tabstop>server_host</tabstop>
   <tabstop>server_port</tabstop>
   <tabstop>use_server_for_submission</tabstop>
+  <tabstop>login</tabstop>
+  <tabstop>logout</tabstop>
   <tabstop>analyze_new_files</tabstop>
+  <tabstop>cluster_new_files</tabstop>
   <tabstop>ignore_file_mbids</tabstop>
   <tabstop>check_for_updates</tabstop>
   <tabstop>update_check_days</tabstop>
diff --git a/ui/options_metadata.ui b/ui/options_metadata.ui
index 10e911873..9e71d44c7 100644
--- a/ui/options_metadata.ui
+++ b/ui/options_metadata.ui
@@ -214,7 +214,11 @@
  </widget>
  <tabstops>
   <tabstop>translate_artist_names</tabstop>
+  <tabstop>selected_locales</tabstop>
+  <tabstop>select_locales</tabstop>
   <tabstop>translate_artist_names_script_exception</tabstop>
+  <tabstop>selected_scripts</tabstop>
+  <tabstop>select_scripts</tabstop>
   <tabstop>standardize_artists</tabstop>
   <tabstop>standardize_instruments</tabstop>
   <tabstop>convert_punctuation</tabstop>