diff --git a/containments/homescreen/package/contents/ui/launcher/Delegate.qml b/containments/homescreen/package/contents/ui/launcher/Delegate.qml
index 301082c6..28d18cbe 100644
--- a/containments/homescreen/package/contents/ui/launcher/Delegate.qml
+++ b/containments/homescreen/package/contents/ui/launcher/Delegate.qml
@@ -50,6 +50,10 @@ ContainmentLayoutManager.ItemContainer {
 
     signal launch(int x, int y, var source, string title)
 
+    Connections {
+        target: mainFlickable
+        onCancelEditModeForItemsRequested: cancelEdit()
+    }
     onDragActiveChanged: {
         launcherDragManager.active = dragActive
         if (dragActive) {
diff --git a/containments/homescreen/package/contents/ui/main.qml b/containments/homescreen/package/contents/ui/main.qml
index 9f5ba21b..b1b4e028 100644
--- a/containments/homescreen/package/contents/ui/main.qml
+++ b/containments/homescreen/package/contents/ui/main.qml
@@ -70,7 +70,6 @@ Item {
     }
 //END functions
 
-
     property bool componentComplete: false
     onWidthChanged: recalculateMaxFavoriteCount()
     onHeightChanged:recalculateMaxFavoriteCount()
@@ -151,6 +150,12 @@ Item {
         contentHeight: flickableContents.height
         interactive: !plasmoid.editMode && !launcherDragManager.active
 
+        signal cancelEditModeForItemsRequested
+        onDragStarted: cancelEditModeForItemsRequested()
+        onDragEnded: cancelEditModeForItemsRequested()
+        onFlickStarted: cancelEditModeForItemsRequested()
+        onFlickEnded: cancelEditModeForItemsRequested()
+
         PlasmaComponents.ScrollBar.vertical: PlasmaComponents.ScrollBar {
             id: scrollabr
             opacity: mainFlickable.moving