diff --git a/src/shell/qmlpackages/desktop/contents/activityswitcher/ActivitySwitcher.qml b/src/shell/qmlpackages/desktop/contents/activityswitcher/ActivitySwitcher.qml
new file mode 100644
index 000000000..df805ae9c
--- /dev/null
+++ b/src/shell/qmlpackages/desktop/contents/activityswitcher/ActivitySwitcher.qml
@@ -0,0 +1,24 @@
+/*
+ *   Copyright 2011 Marco Martin <mart@kde.org>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU Library General Public License as
+ *   published by the Free Software Foundation; either version 2 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 Library General Public
+ *   License along with this program; if not, write to the
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+import QtQuick 2.0
+
+Rectangle {
+    color: "red"
+}
diff --git a/src/shell/qmlpackages/desktop/contents/views/Desktop.qml b/src/shell/qmlpackages/desktop/contents/views/Desktop.qml
index b067a24e9..6221119e8 100644
--- a/src/shell/qmlpackages/desktop/contents/views/Desktop.qml
+++ b/src/shell/qmlpackages/desktop/contents/views/Desktop.qml
@@ -20,7 +20,7 @@ import QtQuick 2.0
 
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
-
+import "../activityswitcher"
 
 Rectangle {
     id: root
@@ -34,8 +34,10 @@ Rectangle {
         console.log("Activity manger toggled");
 
         if (sidePanel.visible) {
+            sidePanelStack.pop();
             sidePanel.visible = false;
         } else {
+            sidePanelStack.push(Qt.resolvedUrl("../activityswitcher/ActivitySwitcher.qml"))
             sidePanel.visible = true;
             sidePanel.height = containment.availableScreenRegion(containment.screen)[0].height;
         }