diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index f4e3ec014479a9fea10f28bc0ac7df884449b45d..d1bcb4659b89c80671aa65578d40e51b66789458 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -293,7 +293,7 @@ var OCdialogs = {
 				conflict.find('.replacement .size').text(humanFileSize(replacement.size));
 				conflict.find('.replacement .mtime').text(formatDate(replacement.lastModifiedDate));
 			}
-			var path = getPathForPreview(original.name);
+			var path = original.directory + '/' +original.name;
 			Files.lazyLoadPreview(path, original.mime, function(previewpath){
 				conflict.find('.original .icon').css('background-image','url('+previewpath+')');
 			}, 96, 96, original.etag);