diff --git a/src/_h5ai/client/js/inc/ext/download.js b/src/_h5ai/client/js/inc/ext/download.js
index 60e4f11d..dedc95f3 100644
--- a/src/_h5ai/client/js/inc/ext/download.js
+++ b/src/_h5ai/client/js/inc/ext/download.js
@@ -29,9 +29,17 @@ modulejs.define('ext/download', ['_', '$', 'core/settings', 'core/resource', 'co
 
         var type = settings.type;
         var extension = (type === 'shell-zip') ? 'zip' : 'tar';
+
+        var name;
+        if (selectedItems.length === 1) {
+            name = selectedItems[0].label;
+        } else {
+            name = location.getItem().label;
+        }
+
         var query = {
                 action: 'download',
-                as: (settings.packageName || location.getItem().label) + '.' + extension,
+                as: (settings.packageName || name) + '.' + extension,
                 type: type,
                 hrefs: _.pluck(selectedItems, 'absHref').join('|:|')
             };
diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json
index fc124a84..62fe67b0 100644
--- a/src/_h5ai/conf/options.json
+++ b/src/_h5ai/conf/options.json
@@ -84,7 +84,7 @@ Options
     To select files the "select"-extension needs to be enabled.
 
     - type: "php-tar", "shell-tar" or "shell-zip"
-    - packageName: basename of the download package, null for current foldername
+    - packageName: basename of the download package, null for current filename or foldername
     - alwaysVisible: always show download button (defaults to download the current folder)
     */
     "download": {