diff --git a/containments/homescreen2/package/contents/ui/launcher/Delegate.qml b/containments/homescreen2/package/contents/ui/launcher/Delegate.qml
index b2461125..38497669 100644
--- a/containments/homescreen2/package/contents/ui/launcher/Delegate.qml
+++ b/containments/homescreen2/package/contents/ui/launcher/Delegate.qml
@@ -33,7 +33,7 @@ import org.kde.phone.homescreen 1.0
 ContainmentLayoutManager.ItemContainer {
     id: delegate
 
-    z: dragging ? 1 : 0
+    z: dragActive ? 1 : 0
 
     property var modelData: typeof model !== "undefined" ? model : null
 
@@ -45,7 +45,7 @@ ContainmentLayoutManager.ItemContainer {
     rightPadding: units.smallSpacing * 2
     bottomPadding: units.smallSpacing * 2
 
-    opacity: dragging ? 0.4 : 1
+    opacity: dragActive ? 0.4 : 1
 
     key: model.ApplicationStorageIdRole
     property real dragCenterX
@@ -113,7 +113,6 @@ ContainmentLayoutManager.ItemContainer {
                 Layout.preferredHeight: Layout.minimumHeight
 
                 source: modelData ? modelData.ApplicationIconRole : ""
-                scale: root.reorderingApps && dragDelegate && !dragging ? 0.6 : 1
                 Behavior on scale {
                     NumberAnimation {
                         duration: units.longDuration
diff --git a/containments/homescreen2/package/contents/ui/launcher/LauncherGrid.qml b/containments/homescreen2/package/contents/ui/launcher/LauncherGrid.qml
index 13915951..6f0e55c8 100644
--- a/containments/homescreen2/package/contents/ui/launcher/LauncherGrid.qml
+++ b/containments/homescreen2/package/contents/ui/launcher/LauncherGrid.qml
@@ -32,9 +32,6 @@ import org.kde.phone.homescreen 1.0
 LauncherContainer {
     id: root
 
-    property bool reorderingApps: false
-
-
     readonly property int cellWidth: root.flow.width / Math.floor(root.flow.width / ((availableCellHeight - reservedSpaceForLabel) + units.smallSpacing*4))
     readonly property int cellHeight: availableCellHeight
 
diff --git a/containments/homescreen2/package/contents/ui/main.qml b/containments/homescreen2/package/contents/ui/main.qml
index 9e615b8b..eee671ca 100644
--- a/containments/homescreen2/package/contents/ui/main.qml
+++ b/containments/homescreen2/package/contents/ui/main.qml
@@ -256,6 +256,9 @@ Item {
                         id: appletContainer
                         configOverlayComponent: ConfigOverlay {}
 
+                        onEditModeChanged: {
+                            launcherDragManager.active = editMode;
+                        }
                         onDragActiveChanged: {
                             launcherDragManager.active = dragActive;
                         }