diff --git a/containments/homescreens/default/package/contents/ui/appdrawer/AppDrawerHeader.qml b/containments/homescreens/default/package/contents/ui/appdrawer/AppDrawerHeader.qml
index bfa4a5cbace6c1cdced445b581746cedbee57fde..c22e09eb4f7ee88f54910c6621b567b8d92398c8 100644
--- a/containments/homescreens/default/package/contents/ui/appdrawer/AppDrawerHeader.qml
+++ b/containments/homescreens/default/package/contents/ui/appdrawer/AppDrawerHeader.qml
@@ -46,4 +46,9 @@ PlasmaCore.ColorScope {
             onClicked: root.switchToGridRequested()
         }
     }
+    
+    //HACK: Here only to steal inputs the would normally be delivered to home
+    MouseArea {
+        anchors.fill: parent
+    }
 }
diff --git a/containments/homescreens/default/package/contents/ui/appdrawer/GridViewAppDrawer.qml b/containments/homescreens/default/package/contents/ui/appdrawer/GridViewAppDrawer.qml
index 52dc81a47b1d4f1b20981f1ca0b15568e6682385..50295a454b0a5855942f39847980e6b90d8cb70d 100644
--- a/containments/homescreens/default/package/contents/ui/appdrawer/GridViewAppDrawer.qml
+++ b/containments/homescreens/default/package/contents/ui/appdrawer/GridViewAppDrawer.qml
@@ -26,7 +26,12 @@ AbstractAppDrawer {
     contentItem: GridView {
         id: gridView
         clip: true
-        interactive: root.homeScreenState.appDrawerInteractive
+        
+        /*
+         * HACK: When the number of apps is less than the one that would fit in the first shown part of the drawer, make
+         * this flickable interactive, in order to steal inputs that would normally be delivered to home.
+         */
+        interactive: contentHeight <= height ? true : root.homeScreenState.appDrawerInteractive
         
         cellWidth: root.contentWidth / Math.floor(root.contentWidth / ((root.availableCellHeight - root.reservedSpaceForLabel) + PlasmaCore.Units.smallSpacing*4))
         cellHeight: root.availableCellHeight