diff --git a/kwinmultitasking/contents/ui/main.qml b/kwinmultitasking/contents/ui/main.qml
index 0f1bbe99..359d5660 100644
--- a/kwinmultitasking/contents/ui/main.qml
+++ b/kwinmultitasking/contents/ui/main.qml
@@ -32,7 +32,9 @@ Item {
     }
 
     function closeWindowList() {
-        mainItemLoader.item.closeWindowList()
+        if (mainItemLoader.item) {
+            mainItemLoader.item.closeWindowList()
+        }
     }
 
     Loader {
diff --git a/kwinmultitasking/contents/ui/panel.qml b/kwinmultitasking/contents/ui/panel.qml
index 0cc21766..913e5136 100644
--- a/kwinmultitasking/contents/ui/panel.qml
+++ b/kwinmultitasking/contents/ui/panel.qml
@@ -40,12 +40,16 @@ PlasmaCore.Dialog {
         PlasmaComponents.ToolButton {
             anchors.horizontalCenter: parent.horizontalCenter
             iconSource: "go-home"
-            onClicked: root.closeWindowList();
+            onClicked: {
+                root.closeWindowList();
+                workspace.slotToggleShowDesktop();
+            }
         }
         
         PlasmaComponents.ToolButton {
             anchors.right: parent.right
             iconSource: "window-close"
+            enabled: workspace.activeClient
             onClicked: workspace.activeClient.closeWindow();
         }
     }
diff --git a/kwinmultitasking/contents/ui/switcher.qml b/kwinmultitasking/contents/ui/switcher.qml
index 255c2143..8b05f756 100644
--- a/kwinmultitasking/contents/ui/switcher.qml
+++ b/kwinmultitasking/contents/ui/switcher.qml
@@ -40,9 +40,10 @@ PlasmaCore.Dialog {
             showAnim.running = true;
         }
     }
-    mainItem: Item {
+    mainItem: Rectangle {
         width: workspace.virtualScreenSize.width
         height: workspace.virtualScreenSize.height
+        color: Qt.rgba(0, 0, 0, 0.5)
 
         SequentialAnimation {
             id: hideAnim