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
@@ -870,6 +870,7 @@
                 Keys.onEscapePressed: {
                     if (!editor.targetItem) {
                         dir.clearSelection();
+                        event.accepted = false;
                     }
                 }
 
@@ -1219,7 +1220,10 @@
                     commit();
                     break;
                 case Qt.Key_Escape:
-                    targetItem = null;
+                    if (targetItem) {
+                        targetItem = null;
+                        event.accepted = true;
+                    }
                     break;
                 case Qt.Key_Home:
                     editor.select(0, 0);