diff --git a/src/filemanager.html b/src/filemanager.html
index a5c233d5f..199e0dca2 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -91,7 +91,11 @@
       <div class="modal-content">
         <div class="modal-body">
           <p class="text-bold text-danger" ng-show="entryRemove.error">{{ entryRemove.error }}</p>
-          <h4 ng-hide="entryRemove.error">{{ 'filemanager.removeDialog.reallyDelete' | tr:{ fileName: entryRemove.entry.fileName } }}</h4>
+          <!-- TODO remove fileName later once all translations have been updated -->
+          <h4 ng-hide="entryRemove.error">{{ 'filemanager.removeDialog.reallyDelete' | tr:{ fileName: selected[0].fileName } }}</h4>
+          <ul>
+            <li ng-repeat="entry in selected">{{ entry.fileName }}</li>
+          </ul>
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.no' | tr }}</button>
diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index 567d91567..d8e38e45f 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -703,11 +703,9 @@ app.controller('FileManagerController', ['$scope', '$translate', '$timeout', 'Cl
     $scope.entryRemove = {
         busy: false,
         error: null,
-        entry: null,
 
-        show: function (entry) {
+        show: function () {
             $scope.entryRemove.error = null;
-            $scope.entryRemove.entry = entry;
 
             $('#entryRemoveModal').modal('show');
         },
@@ -715,9 +713,11 @@ app.controller('FileManagerController', ['$scope', '$translate', '$timeout', 'Cl
         submit: function () {
             $scope.entryRemove.busy = true;
 
-            var filePath = sanitize($scope.cwd + '/' + $scope.entryRemove.entry.fileName);
+            async.eachLimit($scope.selected, 5, function (entry, callback) {
+                var filePath = sanitize($scope.cwd + '/' + entry.fileName);
 
-            Client.filesRemove($scope.id, $scope.type, filePath, function (error) {
+                Client.filesRemove($scope.id, $scope.type, filePath, callback);
+            }, function (error) {
                 $scope.entryRemove.busy = false;
                 if (error) return Client.error(error);
 
@@ -725,6 +725,7 @@ app.controller('FileManagerController', ['$scope', '$translate', '$timeout', 'Cl
 
                 $('#entryRemoveModal').modal('hide');
             });
+
         }
     };
 
@@ -830,11 +831,12 @@ app.controller('FileManagerController', ['$scope', '$translate', '$timeout', 'Cl
                 click: function ($itemScope, $event, entry) { extract(entry); }
             }, {
                 text: tr['filemanager.list.menu.download'],
+                enabled: function () { return $scope.selected.length === 1; },
                 click: function ($itemScope, $event, entry) { download(entry); }
             }, {
                 text: tr['filemanager.list.menu.delete'],
                 hasTopDivider: true,
-                click: function ($itemScope, $event, entry) { $scope.entryRemove.show(entry); }
+                click: function ($itemScope, $event, entry) { $scope.entryRemove.show(); }
             }
         ];
     });