diff --git a/plugins/files/frontend/src/index.js b/plugins/files/frontend/src/index.js
index 63a766b..9787dab 100644
--- a/plugins/files/frontend/src/index.js
+++ b/plugins/files/frontend/src/index.js
@@ -954,7 +954,10 @@
             cancelRename();
             loadEntries();
           }).catch(function (err) {
-            renameInput.value = renameTarget.name;
+            if (isConflictError(err)) {
+              setRenameError('A file with that name already exists');
+              return;
+            }
             setRenameError('Error: ' + ((err && err.message) ? err.message : String(err)));
           });
         });