diff --git a/containments/panel/package/contents/ui/quicksettings/QuickSettings.qml b/containments/panel/package/contents/ui/quicksettings/QuickSettings.qml
index 7f6bde96..36564346 100644
--- a/containments/panel/package/contents/ui/quicksettings/QuickSettings.qml
+++ b/containments/panel/package/contents/ui/quicksettings/QuickSettings.qml
@@ -21,6 +21,7 @@ import QtQuick 2.1
 import QtQuick.Layouts 1.1
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
+import org.kde.plasma.networkmanagement 0.2 as PlasmaNM
 
 Item {
     id: root
@@ -33,6 +34,14 @@ Item {
 
     property bool screenshotRequested: false
 
+    PlasmaNM.Handler {
+    	id: nmHandler
+    }
+
+    PlasmaNM.EnabledConnections {
+    	id: enabledConnections
+    }
+
     function toggleAirplane() {
         print("toggle airplane mode")
     }
@@ -41,6 +50,11 @@ Item {
         plasmoid.nativeInterface.toggleTorch()
     }
 
+    function toggleWifi() {
+    	nmHandler.enableWireless(!enabledConnections.wirelessEnabled)
+	settingsModel.get(1).enabled = !enabledConnections.wirelessEnabled
+    }
+
     function requestShutdown() {
         print("Shutdown requested, depends on ksmserver running");
         var service = pmSource.serviceForSource("PowerDevil");
@@ -122,11 +136,10 @@ Item {
         settingsModel.append({
             "text": i18n("Wifi"),
             "icon": "network-wireless-signal",
-            "enabled": false,
-            "settingsCommand": "plasma-settings -m kcm_mobile_wifi",
-            "toggleFunction": "",
+            "settingsCommand": "",
+            "toggleFunction": "toggleWifi",
             "delegate": "",
-            "enabled": false,
+            "enabled": enabledConnections.wirelessEnabled,
             "applet": null
         });
         settingsModel.append({