diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
--- a/containments/desktop/package/contents/ui/FolderView.qml
+++ b/containments/desktop/package/contents/ui/FolderView.qml
@@ -521,6 +521,8 @@
                         hoverActivateTimer.stop();
                     }
 
+                    editor.targetItem = null;
+
                     dir.setDragHotSpotScrollOffset(contentX, contentY);
 
                     if (contentX == 0) {
@@ -554,6 +556,8 @@
                         hoverActivateTimer.stop();
                     }
 
+                    editor.targetItem = null;
+
                     dir.setDragHotSpotScrollOffset(contentX, contentY);
 
                     if (contentY == 0) {