diff --git a/js/ui/panel.js b/js/ui/panel.js
index 1d9621ae3..0f052d3e8 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -809,6 +809,7 @@ class AggregateMenu extends PanelMenu.Button {
         menuLayout.addSizeChild(this._location.menu.actor);
         menuLayout.addSizeChild(this._rfkill.menu.actor);
         menuLayout.addSizeChild(this._power.menu.actor);
+        menuLayout.addSizeChild(this._system.buttonGroup);
     }
 });
 
diff --git a/js/ui/status/system.js b/js/ui/status/system.js
index 701d9db33..1b0d10d8c 100644
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@@ -236,6 +236,7 @@ var Indicator = class extends PanelMenu.SystemIndicator {
 
         item = new PopupMenu.PopupBaseMenuItem({ reactive: false,
                                                  can_focus: false });
+        this.buttonGroup = item.actor;
 
         let app = this._settingsApp = Shell.AppSystem.get_default().lookup_app(
             'gnome-control-center.desktop'