diff --git a/containments/homescreen/contents/ui/HomeLauncher.qml b/containments/homescreen/contents/ui/HomeLauncher.qml
index 69d3ab60..d8859125 100644
--- a/containments/homescreen/contents/ui/HomeLauncher.qml
+++ b/containments/homescreen/contents/ui/HomeLauncher.qml
@@ -10,7 +10,7 @@ Item {
 
     property var modelData: model
 
-    opacity: root.reorderingApps && delegateRoot.GridView.view.dragData && delegateRoot.GridView.view.dragData.ApplicationStorageIdRole == modelData.ApplicationStorageIdRole ? 0.3 : 1
+    opacity: delegateRoot != dragDelegate && root.reorderingApps && applicationsView.dragData && applicationsView.dragData.ApplicationStorageIdRole == modelData.ApplicationStorageIdRole ? 0.3 : 1
 
     PlasmaCore.IconItem {
         id: icon
@@ -18,7 +18,7 @@ Item {
         width: parent.height / 2
         height: width
         source: modelData.ApplicationIconRole
-        scale: root.reorderingApps && delegateRoot.GridView.view.dragData && delegateRoot.GridView.view.dragData.ApplicationStorageIdRole != modelData.ApplicationStorageIdRole ? 0.6 : 1
+        scale: root.reorderingApps && applicationsView.dragData && applicationsView.dragData.ApplicationStorageIdRole != modelData.ApplicationStorageIdRole ? 0.6 : 1
         Behavior on scale {
             NumberAnimation {
                 duration: units.longDuration
diff --git a/containments/homescreen/contents/ui/main.qml b/containments/homescreen/contents/ui/main.qml
index 973950c3..504a2f3d 100644
--- a/containments/homescreen/contents/ui/main.qml
+++ b/containments/homescreen/contents/ui/main.qml
@@ -223,11 +223,19 @@ MouseEventListener {
         scrollDownIndicator.opacity = 0;
     }
     onClicked: {
-        var pos = mapToItem(applicationsView.contentItem, mouse.x, mouse.y);
-        var item = applicationsView.itemAt(pos.x, pos.y)
+        var pos = mapToItem(applicationsView.headerItem.favoritesStrip, mouse.x, mouse.y);
+        //in favorites area?
+        var item;
+        if (applicationsView.headerItem.favoritesStrip.contains(pos)) {
+            item = applicationsView.headerItem.favoritesStrip.itemAt(pos.x, pos.y);
+        } else {
+            pos = mapToItem(applicationsView.contentItem, mouse.x, mouse.y);
+            item = applicationsView.itemAt(pos.x, pos.y)
+        }
         if (!item) {
             return;
         }
+
         appListModel.runApplication(item.modelData.ApplicationStorageIdRole)
     }
     PlasmaCore.ColorScope {
@@ -449,6 +457,20 @@ MouseEventListener {
                         model: appListModel
                         delegate: HomeLauncher {}
 
+                        move: Transition {
+                            NumberAnimation {
+                                duration: units.longDuration
+                                easing.type: Easing.InOutQuad
+                                properties: "x,y"
+                            }
+                        }
+                        moveDisplaced: Transition {
+                            NumberAnimation {
+                                duration: units.longDuration
+                                easing.type: Easing.InOutQuad
+                                properties: "x,y"
+                            }
+                        }
                     }
                 }
             }