diff --git a/js/ui/panel.js b/js/ui/panel.js
index 4dd8f3341..c32393cff 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -391,10 +391,8 @@ class AggregateMenu extends PanelMenu.Button {
         this._brightness = new imports.ui.status.brightness.Indicator();
         this._system = new imports.ui.status.system.Indicator();
         this._nightLight = new imports.ui.status.nightLight.Indicator();
-        this._thunderbolt = new imports.ui.status.thunderbolt.Indicator();
 
         this._indicators.add_child(this._remoteAccess);
-        this._indicators.add_child(this._thunderbolt);
         this._indicators.add_child(this._nightLight);
         if (this._network)
             this._indicators.add_child(this._network);
@@ -442,11 +440,14 @@ class QuickSettings extends PanelMenu.Button {
         this.setMenu(new QuickSettingsMenu(this, N_QUICK_SETTINGS_COLUMNS));
 
         this._location = new imports.ui.status.location.Indicator();
+        this._thunderbolt = new imports.ui.status.thunderbolt.Indicator();
         this._unsafeMode = new UnsafeModeIndicator();
 
+        this._indicators.add_child(this._thunderbolt);
         this._indicators.add_child(this._location);
         this._indicators.add_child(this._unsafeMode);
 
+        this._addItems(this._thunderbolt.quickSettingsItems);
         this._addItems(this._location.quickSettingsItems);
         this._addItems(this._unsafeMode.quickSettingsItems);
     }
diff --git a/js/ui/status/thunderbolt.js b/js/ui/status/thunderbolt.js
index 56bc731c2..afe3a6195 100644
--- a/js/ui/status/thunderbolt.js
+++ b/js/ui/status/thunderbolt.js
@@ -8,7 +8,7 @@ const Signals = imports.misc.signals;
 
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
-const PanelMenu = imports.ui.panelMenu;
+const {SystemIndicator} = imports.ui.quickSettings;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
 
@@ -216,7 +216,7 @@ var AuthRobot = class extends Signals.EventEmitter {
 /* eof client.js  */
 
 var Indicator = GObject.registerClass(
-class Indicator extends PanelMenu.SystemIndicator {
+class Indicator extends SystemIndicator {
     _init() {
         super._init();