diff --git a/panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in b/panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in
index 12ba0330c..4e32c70a1 100644
--- a/panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in
+++ b/panels/thunderbolt/gnome-thunderbolt-panel.desktop.in.in
@@ -8,7 +8,7 @@ Terminal=false
 Type=Application
 NoDisplay=true
 StartupNotify=true
-Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;HardwareSettings;X-GNOME-DevicesSettings;
+Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;HardwareSettings;X-GNOME-PrivacySettings;
 OnlyShowIn=GNOME;Unity;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
diff --git a/shell/cc-panel-list.c b/shell/cc-panel-list.c
index e40b9f130..dfd360e4b 100644
--- a/shell/cc-panel-list.c
+++ b/shell/cc-panel-list.c
@@ -401,6 +401,7 @@ static const gchar * const panel_order[] = {
   "location",
   "camera",
   "microphone",
+  "thunderbolt",
   "usage",
   "lock",
   "diagnostics",
@@ -413,7 +414,6 @@ static const gchar * const panel_order[] = {
   "keyboard",
   "printers",
   "removable-media",
-  "thunderbolt",
   "wacom",
   "color",