diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 857865c711..bdd4a6ffc3 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1214,7 +1214,9 @@
 					if (firstConflictPath.charAt(0) === '/') {
 						firstConflictPath = firstConflictPath.substr(1);
 					}
-					$firstConflict.find('td.filename span.innernametext').prepend($('<span></span>').addClass('conflict-path').text(firstConflictPath));
+					if (firstConflictPath && firstConflictPath !== '/') {
+						$firstConflict.find('td.filename span.innernametext').prepend($('<span></span>').addClass('conflict-path').text(firstConflictPath));
+					}
 				}
 
 				var conflictPath = path + '/';