diff --git a/containments/homescreen/package/contents/ui/AppletsArea.qml b/containments/homescreen/package/contents/ui/AppletsArea.qml
index 61daaa0e..658cb16d 100644
--- a/containments/homescreen/package/contents/ui/AppletsArea.qml
+++ b/containments/homescreen/package/contents/ui/AppletsArea.qml
@@ -112,8 +112,8 @@ MouseEventListener {
         }
         Item {
             Layout.fillWidth: true
-            Layout.minimumHeight: root.height
-            Layout.maximumHeight: root.height
+            Layout.minimumHeight: plasmoid.availableScreenRect.height
+            Layout.maximumHeight: plasmoid.availableScreenRect.height
             Clock {
                 anchors {
                     horizontalCenter: parent.horizontalCenter
@@ -169,8 +169,8 @@ MouseEventListener {
         z: 99
         property int viewPos: applicationsView.contentItem.height * applicationsView.visibleArea.yPosition
 
-        y: Math.max(viewPos + plasmoid.availableScreenRect.y + krunner.inputHeight - units.smallSpacing, 
-            Math.min(parent.height, viewPos + plasmoid.availableScreenRect.y + plasmoid.availableScreenRect.height - height) + Math.max(0, -(parent.height - height + applicationsView.contentY)))
+        y: Math.max(viewPos + krunner.inputHeight - units.smallSpacing, 
+            Math.min(parent.height, viewPos + plasmoid.availableScreenRect.height - height) + Math.max(0, -(parent.height - height + applicationsView.contentY)))
 
         GridView {
             id: favoritesView
diff --git a/containments/homescreen/package/contents/ui/main.qml b/containments/homescreen/package/contents/ui/main.qml
index 0f799985..ae6097ba 100644
--- a/containments/homescreen/package/contents/ui/main.qml
+++ b/containments/homescreen/package/contents/ui/main.qml
@@ -294,6 +294,7 @@ Item {
 
     MouseEventListener {
         anchors.fill: parent
+
         //Events handling: those events are about clicking and reordering of app icons
         //applet related events are in AppeltsArea.qml
         onPressAndHold: {
@@ -500,10 +501,9 @@ Item {
             GridView {
                 id: applicationsView
                 anchors {
-                    top: parent.top
-                    bottom: parent.bottom
-                    left: parent.left
-                    right: parent.right
+                    fill: parent
+                    topMargin: plasmoid.availableScreenRect.y
+                    bottomMargin: root.height - plasmoid.availableScreenRect.y - plasmoid.availableScreenRect.height
                 }
 
                 property var dragData