diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php
index 7684d0465e6872b5c3f9f99255a18400f82cca96..915ad9379f6f1da60c1c6f4e9ec2176c65c25a4c 100644
--- a/apps/files_trashbin/ajax/delete.php
+++ b/apps/files_trashbin/ajax/delete.php
@@ -26,7 +26,7 @@ foreach ($list as $file) {
 	}
 	
 	OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp);
-	if (!OCA\Files_Trashbin\Trashbin::file_exists($filename)) {
+	if (!OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) {
 		$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 1dfe09feca0896344cadee808ee6892be3276976..fc38889dc377cd48e858047c0510a91abb9ac2b9 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -36,11 +36,11 @@ $(document).ready(function() {
 			$.post(OC.filePath('files_trashbin','ajax','delete.php'),
 				{files:tr.attr('data-file'), dirlisting:tr.attr('data-dirlisting') },
 				function(result){
-					if ( result.status == 'success' ) {
-						var row = document.getElementById(result.data.filename);
+					for (var i = 0; i < result.data.success.length; i++) {
+						var row = document.getElementById(result.data.success[i].filename);
 						row.parentNode.removeChild(row);
-					} else {
-						deleteAction[0].outerHTML = oldHTML;
+					}
+					if (result.status != 'success') {
 						OC.dialogs.alert(result.data.message, 'Error');
 					}
 				});