diff --git a/containments/homescreen/package/metadata.desktop b/containments/homescreen/package/metadata.desktop
index a6c81a76..ee2d146e 100644
--- a/containments/homescreen/package/metadata.desktop
+++ b/containments/homescreen/package/metadata.desktop
@@ -8,7 +8,7 @@ X-KDE-ServiceTypes=Plasma/Applet,Plasma/Containment
 X-Plasma-API=declarativeappletscript
 X-KDE-Library=plasma_containment_phone_homescreen
 X-KDE-PluginInfo-Author=Marco Martin
-X-KDE-PluginInfo-Category=
+X-KDE-PluginInfo-Category=Containments
 X-KDE-PluginInfo-Email=mart@kde.org
 X-KDE-PluginInfo-License=GPLv2+
 X-KDE-PluginInfo-Name=org.kde.phone.homescreen
diff --git a/containments/panel/metadata.desktop b/containments/panel/metadata.desktop
index 34195117..873c5907 100644
--- a/containments/panel/metadata.desktop
+++ b/containments/panel/metadata.desktop
@@ -8,7 +8,7 @@ X-KDE-ServiceTypes=Plasma/Applet,Plasma/Containment
 X-Plasma-API=declarativeappletscript
 X-KDE-ParentApp=
 X-KDE-PluginInfo-Author=Marco Martin
-X-KDE-PluginInfo-Category=
+X-KDE-PluginInfo-Category=Containments
 X-KDE-PluginInfo-Email=mart@kde.org
 X-KDE-PluginInfo-License=GPLv2+
 X-KDE-PluginInfo-Name=org.kde.phone.panel
diff --git a/containments/taskpanel/package/metadata.desktop b/containments/taskpanel/package/metadata.desktop
index bc57d19a..9fd5f970 100644
--- a/containments/taskpanel/package/metadata.desktop
+++ b/containments/taskpanel/package/metadata.desktop
@@ -8,7 +8,7 @@ X-KDE-ServiceTypes=Plasma/Applet,Plasma/Containment
 X-Plasma-API=declarativeappletscript
 X-KDE-Library=plasma_containment_phone_taskpanel
 X-KDE-PluginInfo-Author=Marco Martin
-X-KDE-PluginInfo-Category=
+X-KDE-PluginInfo-Category=Containments
 X-KDE-PluginInfo-Email=mart@kde.org
 X-KDE-PluginInfo-License=GPLv2+
 X-KDE-PluginInfo-Name=org.kde.phone.taskpanel
diff --git a/shell/contents/explorer/AppletDelegate.qml b/shell/contents/explorer/AppletDelegate.qml
index 0f5816a9..5c0f14d8 100644
--- a/shell/contents/explorer/AppletDelegate.qml
+++ b/shell/contents/explorer/AppletDelegate.qml
@@ -146,8 +146,9 @@ Item {
         id: mouseArea
         anchors.fill: parent
         hoverEnabled: true
-        onDoubleClicked: widgetExplorer.addApplet(pluginName)
-        onEntered: delegate.ListView.view.currentIndex = index
-        onExited: delegate.ListView.view.currentIndex = -1
+        onClicked: {
+            widgetExplorer.addApplet(pluginName);
+            main.closed();
+        }
     }
 }
diff --git a/shell/contents/explorer/WidgetExplorer.qml b/shell/contents/explorer/WidgetExplorer.qml
index 672bebb8..6939bcd3 100644
--- a/shell/contents/explorer/WidgetExplorer.qml
+++ b/shell/contents/explorer/WidgetExplorer.qml
@@ -33,7 +33,7 @@ import org.kde.plasma.private.shell 2.0
 PlasmaCore.FrameSvgItem {
     id: main
     imagePath: "widgets/background"
-    enabledBorders: PlasmaCore.FrameSvgItem.RightBorder
+    enabledBorders: PlasmaCore.FrameSvgItem.NoBorder
 
     width: Math.max(heading.paintedWidth, units.gridUnit * 16)
     height: 800//Screen.height
diff --git a/shell/contents/views/Desktop.qml b/shell/contents/views/Desktop.qml
index 79357f27..fa9b84d5 100644
--- a/shell/contents/views/Desktop.qml
+++ b/shell/contents/views/Desktop.qml
@@ -53,7 +53,7 @@ Item {
         asynchronous: true
         y: containment ? containment.availableScreenRect.y : 0
         height: containment ? containment.availableScreenRect.height : parent.height
-        width: item ? item.width: 0
+        width: parent.width
         
         onLoaded: {
             if (widgetExplorerStack.item) {