diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index b54805c63e5..cde388015e5 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -82,10 +82,11 @@ class Trashbin {
 				}
 			}
 			
-			// Take care of encryption keys
-			if ( \OCP\App::isEnabled('files_encryption') ) {
-				$trashbinSize += self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_encryption/keyfiles/'.$file_path));
-				$view->rename('files_encryption'.$file_path, 'files_trashbin/keyfiles'. $deleted.'.d'.$timestamp);
+			// Take care of encryption keys
+			$keyfile = \OC_Filesystem::normalizePath('files_encryption/keyfiles/'.$file_path.'.key');
+			if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) {
+				$trashbinSize += $view->filesize($keyfile);
+				$view->rename($keyfile, 'files_trashbin/keyfiles/'. $deleted.'.d'.$timestamp);
 			}
 
 		} else {
@@ -187,7 +188,18 @@ class Trashbin {
 					}
 				}
 			}
-
+			
+			// Take care of encryption keys
+			$keyfile = 'files_trashbin/keyfiles/'.$file;
+			if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) {
+				if ( $result[0]['type'] == 'dir' ) {
+					$trashbinSize -= self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.$keyfile));
+				} else {
+					$trashbinSize -= $view->filesize($keyfile);
+				}
+				$view->rename($keyfile, 'files_encryption/keyfiles/'. $location.'/'.$filename.'.key');
+			}
+			
 			if ( $timestamp ) {
 				$query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?');
 				$query->execute(array($user,$filename,$timestamp));