diff --git a/kwinmultitasking/contents/ui/main.qml b/kwinmultitasking/contents/ui/main.qml
index 039aee07..0f1bbe99 100644
--- a/kwinmultitasking/contents/ui/main.qml
+++ b/kwinmultitasking/contents/ui/main.qml
@@ -28,6 +28,11 @@ Item {
             mainItemLoader.source = "switcher.qml";
         }
         mainItemLoader.item.visible = true;
+        panelLoader.item.raise();
+    }
+
+    function closeWindowList() {
+        mainItemLoader.item.closeWindowList()
     }
 
     Loader {
diff --git a/kwinmultitasking/contents/ui/panel.qml b/kwinmultitasking/contents/ui/panel.qml
new file mode 100644
index 00000000..47edf3f3
--- /dev/null
+++ b/kwinmultitasking/contents/ui/panel.qml
@@ -0,0 +1,48 @@
+/********************************************************************
+ This file is part of the KDE project.
+
+Copyright (C) 2015 Marco MArtin <mart@kde.org>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*********************************************************************/
+import QtQuick 2.0
+import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components 2.0 as PlasmaComponents
+import org.kde.kwin 2.0;
+
+PlasmaCore.Dialog {
+    id: panel
+    y: workspace.virtualScreenSize.height - height
+    flags: Qt.X11BypassWindowManagerHint
+    
+    mainItem: Item {
+        width: workspace.virtualScreenSize.width
+        height: units.iconSizes.medium
+        PlasmaComponents.ToolButton {
+            anchors.left: parent.left
+            iconSource: "applications-other"
+            onClicked: root.showWindowList();
+        }
+
+        PlasmaComponents.ToolButton {
+            anchors.horizontalCenter: parent.horizontalCenter
+            iconSource: "go-home"
+            onClicked: root.closeWindowList();
+        }
+    }
+    Component.onCompleted: {
+      //  KWin.registerWindow(panel);
+        panel.visible = true;
+    }
+}
diff --git a/kwinmultitasking/contents/ui/switcher.qml b/kwinmultitasking/contents/ui/switcher.qml
index 4a3eca8d..5d60fd4d 100644
--- a/kwinmultitasking/contents/ui/switcher.qml
+++ b/kwinmultitasking/contents/ui/switcher.qml
@@ -31,6 +31,10 @@ PlasmaCore.Dialog {
     flags: Qt.X11BypassWindowManagerHint
     backgroundHints: PlasmaCore.Dialog.NoBackground
 
+    function closeWindowList() {
+        hideAnim.running = true;
+    }
+
     onVisibleChanged: {
         if (visible) {
             showAnim.running = true;
@@ -96,11 +100,11 @@ PlasmaCore.Dialog {
                     anchors.fill: parent
                     //parentWindow: dialog.windowId
                     client: model.client
-                    brightness: (index == view.currentIndex) ? 1.0 : 0.4
+                    brightness: (model.client == workspace.activeClient) ? 1.0 : 0.6
                 }
                 onClicked: {
                     workspace.activeClient = model.client
-                    dialog.visible = false
+                    hideAnim.running = true
                 }
             }
         }