diff --git a/src/_h5ai/client/js/inc/ext/download.js b/src/_h5ai/client/js/inc/ext/download.js
index 60e4f11d..0b1aa56e 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 = settings.packageName || location.getItem().label;
+        }
+
         var query = {
                 action: 'download',
-                as: (settings.packageName || location.getItem().label) + '.' + extension,
+                as: name + '.' + extension,
                 type: type,
                 hrefs: _.pluck(selectedItems, 'absHref').join('|:|')
             };