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
@@ -459,8 +459,8 @@
                     dragY = -1;
                     clearPressState();
                 } else {
-                    // Disable rubberband in popup list view mode.
-                    if (root.useListViewMode) {
+                    // Disable rubberband in popup list view mode or while renaming
+                    if (root.useListViewMode || editor.targetItem) {
                         return;
                     }