diff --git a/containments/panel/contents/ui/SlidingPanel.qml b/containments/panel/contents/ui/SlidingPanel.qml
index 5759f1c9..423bc908 100644
--- a/containments/panel/contents/ui/SlidingPanel.qml
+++ b/containments/panel/contents/ui/SlidingPanel.qml
@@ -135,6 +135,10 @@ Window {
         MouseArea {
             z: -1
             anchors.fill: parent
+            onClicked: {
+                mouseArea.state = "closed";
+                window.visible = false;
+            }
         }
 
         states: [
diff --git a/shell/contents/layout.js b/shell/contents/layout.js
index 7da759f0..ea26268f 100644
--- a/shell/contents/layout.js
+++ b/shell/contents/layout.js
@@ -17,5 +17,6 @@ for (var j = 0; j < desktopsArray.length; j++) {
 desktopsForActivity(id)[0].addWidget("org.kde.phone.notifications");
 
 var panel = new Panel("org.kde.phone.panel");
-panel.addWidget("org.kde.phone.quicksettings");
+panel.addWidget("org.kde.plasma.networkmanagement");
+panel.addWidget("org.kde.plasma.battery");
 panel.height = 60;