diff --git a/Modules/Bar/Widgets/Bluetooth.qml b/Modules/Bar/Widgets/Bluetooth.qml
index 2ce3fea6..a6b5894b 100644
--- a/Modules/Bar/Widgets/Bluetooth.qml
+++ b/Modules/Bar/Widgets/Bluetooth.qml
@@ -56,7 +56,7 @@ Item {
     forceOpen: !isBarVertical && root.displayMode === "alwaysShow"
     forceClose: isBarVertical || root.displayMode === "alwaysHide" || BluetoothService.connectedDevices.length === 0
     onClicked: PanelService.getPanel("bluetoothPanel", screen)?.toggle(this)
-    onRightClicked: PanelService.getPanel("bluetoothPanel", screen)?.toggle(this)
+    onRightClicked: BluetoothService.setBluetoothEnabled(!BluetoothService.enabled)
     tooltipText: {
       if (pill.text !== "") {
         return pill.text
diff --git a/Modules/Bar/Widgets/WiFi.qml b/Modules/Bar/Widgets/WiFi.qml
index ad2d1ede..2c23542b 100644
--- a/Modules/Bar/Widgets/WiFi.qml
+++ b/Modules/Bar/Widgets/WiFi.qml
@@ -78,7 +78,7 @@ Item {
     forceOpen: !isBarVertical && root.displayMode === "alwaysShow"
     forceClose: isBarVertical || root.displayMode === "alwaysHide" || !pill.text
     onClicked: PanelService.getPanel("wifiPanel", screen)?.toggle(this)
-    onRightClicked: PanelService.getPanel("wifiPanel", screen)?.toggle(this)
+    onRightClicked: NetworkService.setWifiEnabled(!Settings.data.network.wifiEnabled)
     tooltipText: {
       if (pill.text !== "") {
         return pill.text
diff --git a/Modules/Panels/ControlCenter/Widgets/Bluetooth.qml b/Modules/Panels/ControlCenter/Widgets/Bluetooth.qml
index d3ab79ad..e6280a37 100644
--- a/Modules/Panels/ControlCenter/Widgets/Bluetooth.qml
+++ b/Modules/Panels/ControlCenter/Widgets/Bluetooth.qml
@@ -10,7 +10,6 @@ NIconButtonHot {
 
   icon: BluetoothService.enabled ? "bluetooth" : "bluetooth-off"
   tooltipText: I18n.tr("quickSettings.bluetooth.tooltip.action")
-  onClicked: {
-    PanelService.getPanel("bluetoothPanel", screen)?.toggle(this)
-  }
+  onClicked: PanelService.getPanel("bluetoothPanel", screen)?.toggle(this)
+  onRightClicked: BluetoothService.setBluetoothEnabled(!BluetoothService.enabled)
 }
diff --git a/Modules/Panels/ControlCenter/Widgets/WiFi.qml b/Modules/Panels/ControlCenter/Widgets/WiFi.qml
index e40047f1..2ea25141 100644
--- a/Modules/Panels/ControlCenter/Widgets/WiFi.qml
+++ b/Modules/Panels/ControlCenter/Widgets/WiFi.qml
@@ -31,4 +31,5 @@ NIconButtonHot {
 
   tooltipText: I18n.tr("quickSettings.wifi.tooltip.action")
   onClicked: PanelService.getPanel("wifiPanel", screen)?.toggle(this)
+  onRightClicked: NetworkService.setWifiEnabled(!Settings.data.network.wifiEnabled)
 }