diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php
index 5aa6436ae5..178d85ccf3 100644
--- a/apps/files_trashbin/ajax/undelete.php
+++ b/apps/files_trashbin/ajax/undelete.php
@@ -25,7 +25,7 @@ foreach ($list as $file) {
 	if ( !OCA_Trash\Trashbin::restore($file, $filename, $timestamp) ) {
 		$error[] = $filename;
 	} else {
-		$success[$i]['filename'] = $filename;
+		$success[$i]['filename'] = $file;
 		$success[$i]['timestamp'] = $timestamp;
 		$i++;
 	}
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index 355e25d97d..92a431d495 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -8,7 +8,7 @@ $(document).ready(function() {
 				{files:tr.attr('data-file'), dirlisting:tr.attr('data-dirlisting') },
 				function(result){
 					for (var i = 0; i < result.data.success.length; i++) {
-						var row = document.getElementById(result.data.success[i].filename+'.d'+result.data.success[i].timestamp);
+						var row = document.getElementById(result.data.success[i].filename);
 						row.parentNode.removeChild(row);
 					}
 					if (result.status != 'success') {
@@ -69,7 +69,7 @@ $(document).ready(function() {
 					{files:fileslist, dirlisting:dirlisting},
 					function(result){
 						for (var i = 0; i < result.data.success.length; i++) {
-							var row = document.getElementById(result.data.success[i].filename+'.d'+result.data.success[i].timestamp);
+							var row = document.getElementById(result.data.success[i].filename);
 							row.parentNode.removeChild(row);
 						}
 						if (result.status != 'success') {