diff --git a/compositor/contents/Compositor.qml b/compositor/contents/Compositor.qml
index 231eff10..975c3ec2 100644
--- a/compositor/contents/Compositor.qml
+++ b/compositor/contents/Compositor.qml
@@ -80,8 +80,11 @@ Rectangle {
 
     Rectangle {
         id: windowsLayerBackground
-        anchors.fill: parent
-        anchors.topMargin: topBarHeight
+        anchors {
+            fill: parent
+            topMargin: topBarHeight
+            bottomMargin: bottomBarHeight
+        }
         color: Qt.rgba(0, 0, 0, 0.9)
 
         Flickable {
@@ -134,7 +137,7 @@ Rectangle {
         anchors.right: parent.right
         anchors.bottom: parent.bottom
         height: compositorRoot.state == "homeScreen" ? 0 : bottomBarHeight
-        color: Qt.rgba(0, 0, 0, windowsLayout.scale)
+        color: Qt.rgba(0, 0, 0, 0.9 + 0.1*windowsLayout.scale)
 
         Behavior on height {
             NumberAnimation {
diff --git a/compositor/contents/WindowManagement.js b/compositor/contents/WindowManagement.js
index 89e4b688..a2ae56e1 100644
--- a/compositor/contents/WindowManagement.js
+++ b/compositor/contents/WindowManagement.js
@@ -125,6 +125,10 @@ function mapApplicationSurface(surface) {
     // likely have just one output
     var child = compositor.viewForOutput(surface, _greenisland_output);
 
+    child.resizeSurfaceToItem = true;
+    child.width = compositorRoot.layers.windows.width;
+    child.height = compositorRoot.layers.windows.height;
+
     // Create and setup window container
     var window = component.createObject(compositorRoot.layers.windows, {"child": child});
     compositorRoot.layers.windows.addWindow(window);