diff --git a/containments/homescreen/package/contents/ui/KRunner.qml b/containments/homescreen/package/contents/ui/KRunner.qml
index f47aaff5..05c2b941 100644
--- a/containments/homescreen/package/contents/ui/KRunner.qml
+++ b/containments/homescreen/package/contents/ui/KRunner.qml
@@ -71,6 +71,7 @@ Rectangle {
         }
 
         ColumnLayout {
+            height: Math.min(implicitHeight, (plasmoid.availableScreenRect.y + plasmoid.availableScreenRect.height) - Qt.inputMethod.keyboardRectangle.y)
             anchors {
                 left: parent.left
                 right: parent.right
@@ -89,19 +90,22 @@ Rectangle {
                 placeholderText: "Search ..."
             }
 
-            Milou.ResultsView {
-                id: listView
-                queryString: queryField.text
-                visible: count > 0
-
+            PlasmaExtras.ScrollArea {
+                visible: listView.count > 0
                 Layout.fillWidth: true
+                Layout.fillHeight: true
                 Layout.preferredHeight: listView.contentHeight
                 Layout.alignment: Qt.AlignTop
 
-                onActivated: queryField.text = ""
-                onUpdateQueryString: {
-                    queryField.text = text
-                    queryField.cursorPosition = cursorPosition
+                Milou.ResultsView {
+                    id: listView
+                    queryString: queryField.text
+
+                    onActivated: queryField.text = ""
+                    onUpdateQueryString: {
+                        queryField.text = text
+                        queryField.cursorPosition = cursorPosition
+                    }
                 }
             }
 
diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml
index 3dee0916..ed15d5e5 100644
--- a/containments/panel/contents/ui/main.qml
+++ b/containments/panel/contents/ui/main.qml
@@ -173,8 +173,9 @@ PlasmaCore.ColorScope {
             anchors {
                 bottom: parent.bottom
                 right: parent.right
+                bottomMargin: slidingPanel.visible ? parent.height : 0
             }
-            height: slidingPanel.visible ? units.iconSizes.huge : parent.height
+            height: slidingPanel.visible ? units.iconSizes.large : parent.height
             Behavior on height {
                 PropertyAnimation {
                     duration: units.longDuration
@@ -223,7 +224,7 @@ PlasmaCore.ColorScope {
                 id: appletsStack
                 anchors {
                     fill: parent
-                    bottomMargin: units.iconSizes.huge
+                    bottomMargin: units.iconSizes.large
                 }
             }
         }