diff --git a/containments/homescreen/contents/ui/main.qml b/containments/homescreen/contents/ui/main.qml
index e506af37..0f29cfd6 100644
--- a/containments/homescreen/contents/ui/main.qml
+++ b/containments/homescreen/contents/ui/main.qml
@@ -262,7 +262,6 @@ MouseEventListener {
                 right: parent.right
             }
 
-            property Item draggingItem
             property var dragData
 
             cellWidth: root.buttonHeight
@@ -391,7 +390,6 @@ MouseEventListener {
                         flow: GridView.FlowTopToBottom
                         cellWidth: root.buttonHeight
                         cellHeight: cellWidth
-                        property Item draggingItem
 
                         model: appListModel
                         delegate: HomeLauncher {}
diff --git a/qmlcomponents/applicationlistmodel.cpp b/qmlcomponents/applicationlistmodel.cpp
index 8866ecb8..c7373448 100644
--- a/qmlcomponents/applicationlistmodel.cpp
+++ b/qmlcomponents/applicationlistmodel.cpp
@@ -182,8 +182,14 @@ Q_INVOKABLE void ApplicationListModel::moveItem(int row, int destination)
     }
 
     beginMoveRows(QModelIndex(), row, row, QModelIndex(), destination);
-    ApplicationData data = m_applicationList.takeAt(row);
-    m_applicationList.insert(destination, data);
+    if (destination > row) {
+        ApplicationData data = m_applicationList.at(row);
+        m_applicationList.insert(destination, data);
+        m_applicationList.takeAt(row);
+    } else {
+        ApplicationData data = m_applicationList.takeAt(row);
+        m_applicationList.insert(destination, data);
+    }
 
 
     m_appOrder.clear();