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
@@ -68,6 +68,10 @@
         }
     }
 
+    function cancelRename() {
+        editor.targetItem = null;
+    }
+
     function linkHere(sourceUrl) {
         dir.linkHere(sourceUrl);
     }
diff --git a/containments/desktop/package/contents/ui/FolderViewLayer.qml b/containments/desktop/package/contents/ui/FolderViewLayer.qml
--- a/containments/desktop/package/contents/ui/FolderViewLayer.qml
+++ b/containments/desktop/package/contents/ui/FolderViewLayer.qml
@@ -57,6 +57,10 @@
         }
     }
 
+    function cancelRename() {
+        folderView.cancelRename();
+    }
+
     PlasmaCore.Svg {
         id: actionOverlays
 
@@ -137,7 +141,7 @@
                 }
 
                 folderView.currentIndex = -1;
-                folderView.model.clearSelection();
+                folderView.cancelRename();
             }
         }
 
diff --git a/containments/desktop/package/contents/ui/main.qml b/containments/desktop/package/contents/ui/main.qml
--- a/containments/desktop/package/contents/ui/main.qml
+++ b/containments/desktop/package/contents/ui/main.qml
@@ -418,6 +418,10 @@
         onFocusChanged: {
             if (!focus && model) {
                 model.clearSelection();
+
+                if (item) {
+                    item.cancelRename();
+                }
             }
         }