diff --git a/containments/homescreen/package/contents/ui/KRunner.qml b/containments/homescreen/package/contents/ui/KRunner.qml
index 3632d877..bd5c6677 100644
--- a/containments/homescreen/package/contents/ui/KRunner.qml
+++ b/containments/homescreen/package/contents/ui/KRunner.qml
@@ -35,6 +35,7 @@ Rectangle {
     color: listView.visible ? Qt.rgba(0, 0, 0, 0.8) : "transparent"
     property alias showingResults: listView.visible
     property int inputHeight: queryField.height + background.fixedMargins.top/2 + background.fixedMargins.bottom
+    property int topPadding: 0
 
     MouseArea {
         enabled: listView.visible
@@ -70,14 +71,14 @@ Rectangle {
         }
 
         ColumnLayout {
-            height: Qt.inputMethod.keyboardRectangle.height > 0 ? (Math.min(implicitHeight, background.height, Qt.inputMethod.keyboardRectangle.y - plasmoid.availableScreenRect.y)) : implicitHeight
+            height: Qt.inputMethod.keyboardRectangle.height > 0 ? (Math.min(implicitHeight, background.height, Qt.inputMethod.keyboardRectangle.y - plasmoid.availableScreenRect.y)) : implicitHeight + anchors.topMargin
             anchors {
                 left: parent.left
                 right: parent.right
                 top: parent.top
-                topMargin: background.fixedMargins.top / 2
-                leftMargin: background.fixedMargins.left / 2
-                rightMargin: background.fixedMargins.right / 2
+                topMargin: background.fixedMargins.top / 2 + krunner.topPadding
+                leftMargin: background.fixedMargins.left
+                rightMargin: background.fixedMargins.right
             }
             PlasmaComponents.TextField {
                 id: queryField
diff --git a/containments/homescreen/package/contents/ui/main.qml b/containments/homescreen/package/contents/ui/main.qml
index 135a4b81..fa3a0a35 100644
--- a/containments/homescreen/package/contents/ui/main.qml
+++ b/containments/homescreen/package/contents/ui/main.qml
@@ -325,11 +325,11 @@ Item {
         id: krunner
         z: 998
         height: plasmoid.availableScreenRect.height
+        topPadding: plasmoid.availableScreenRect.y
         anchors {
             top: parent.top
             left: parent.left
             right: parent.right
-            topMargin: plasmoid.availableScreenRect.y
         }
     }
 }
diff --git a/containments/panel/package/contents/ui/main.qml b/containments/panel/package/contents/ui/main.qml
index 71814da8..37ebfc4f 100644
--- a/containments/panel/package/contents/ui/main.qml
+++ b/containments/panel/package/contents/ui/main.qml
@@ -24,6 +24,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 
 import org.kde.plasma.workspace.components 2.0 as PlasmaWorkspace
+import org.kde.taskmanager 0.1 as TaskManager
 
 import "LayoutManager.js" as LayoutManager
 
@@ -32,14 +33,18 @@ import "quicksettings"
 PlasmaCore.ColorScope {
     id: root
     width: 480
-    height: 640
+    height: 30
     //colorGroup: PlasmaCore.Theme.ComplementaryColorGroup
 
+    Plasmoid.backgroundHints: showingApp ? PlasmaCore.Types.StandardBackground : PlasmaCore.Types.NoBackground
+
     property Item toolBox
     property int buttonHeight: width/4
     property bool reorderingApps: false
     property var layoutManager: LayoutManager
 
+    readonly property bool showingApp: tasksModel.activeTask && tasksModel.activeTask.valid && !tasksModel.data(tasksModel.activeTask, TaskManager.AbstractTasksModel.IsFullScreen)
+
     Containment.onAppletAdded: {
         addApplet(applet, x, y);
         LayoutManager.save();
@@ -77,6 +82,16 @@ PlasmaCore.ColorScope {
         LayoutManager.restore();
     }
 
+    TaskManager.TasksModel {
+        id: tasksModel
+        sortMode: TaskManager.TasksModel.SortVirtualDesktop
+        groupMode: TaskManager.TasksModel.GroupDisabled
+
+        screenGeometry: plasmoid.screenGeometry
+        filterByScreen: plasmoid.configuration.showForCurrentScreenOnly
+
+    }
+
     PlasmaCore.DataSource {
         id: statusNotifierSource
         engine: "statusnotifieritem"
@@ -113,7 +128,7 @@ PlasmaCore.ColorScope {
         interval: 60 * 1000
     }
 
-    Rectangle {
+    Item {
         z: 1
         //parent: slidingPanel.visible && !slidingPanel.wideScreen ? panelContents : root
         anchors {
@@ -122,7 +137,11 @@ PlasmaCore.ColorScope {
             bottom: parent.bottom
         }
         height: root.height
-        color: PlasmaCore.ColorScope.backgroundColor
+        Rectangle {
+            anchors.fill: parent
+            color: PlasmaCore.ColorScope.backgroundColor
+            opacity: showingApp
+        }
 
         Loader {
             id: strengthLoader