diff --git a/compositor/contents/Compositor.qml b/compositor/contents/Compositor.qml
index 975c3ec2..5e086764 100644
--- a/compositor/contents/Compositor.qml
+++ b/compositor/contents/Compositor.qml
@@ -23,6 +23,7 @@ import QtQml.Models 2.1
 import org.kde.plasma.core 2.0 as PlasmaCore
 import "WindowManagement.js" as WindowManagement
 
+
 Rectangle {
     property alias showSplash: splash.visible
     property bool showPanel: true
@@ -127,12 +128,12 @@ Rectangle {
         id: panelLayer
         anchors.fill: parent
         visible: showPanel
-        z: 3
+        z: 4
     }
 
     Rectangle {
         id: bottomBar
-        z: 4
+        z: 3
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.bottom: parent.bottom
diff --git a/compositor/contents/WindowManagement.js b/compositor/contents/WindowManagement.js
index 6aacc55e..b0f392ce 100644
--- a/compositor/contents/WindowManagement.js
+++ b/compositor/contents/WindowManagement.js
@@ -194,6 +194,9 @@ function mapShellSurface(surface, child) {
     window.x = window.y = 0;
     window.width = surface.size.width;
     window.height = surface.size.height;
+    if (surface.className == "maliit-server.desktop") {
+        window.y = compositorRoot.layers.panel.height - window.height;
+    }
 
     // Switch to the desktop layer and take focus
     compositorRoot.showSplash = false;