diff --git a/containments/desktop/plugins/folder/foldermodel.cpp b/containments/desktop/plugins/folder/foldermodel.cpp
--- a/containments/desktop/plugins/folder/foldermodel.cpp
+++ b/containments/desktop/plugins/folder/foldermodel.cpp
@@ -760,11 +760,12 @@
 
 QPoint FolderModel::dragCursorOffset(int row)
 {
-    if (!m_dragImages.contains(row)) {
+    DragImage *image = m_dragImages.value(row);
+    if (!image) {
         return QPoint(-1, -1);
     }
 
-    return m_dragImages.value(row)->cursorOffset;
+    return image->cursorOffset;
 }
 
 void FolderModel::addDragImage(QDrag *drag, int x, int y)
diff --git a/containments/desktop/plugins/folder/positioner.cpp b/containments/desktop/plugins/folder/positioner.cpp
--- a/containments/desktop/plugins/folder/positioner.cpp
+++ b/containments/desktop/plugins/folder/positioner.cpp
@@ -139,11 +139,7 @@
 int Positioner::map(int row) const
 {
     if (m_enabled && m_folderModel) {
-        if (m_proxyToSource.contains(row)) {
-            return m_proxyToSource.value(row);
-        } else {
-            return -1;
-        }
+        return m_proxyToSource.value(row, -1);
     }
 
     return row;