diff --git a/core/src/plugins/access.fs/class.fsAccessDriver.php b/core/src/plugins/access.fs/class.fsAccessDriver.php
index e8e2de4e8b..f4a23f01ab 100644
--- a/core/src/plugins/access.fs/class.fsAccessDriver.php
+++ b/core/src/plugins/access.fs/class.fsAccessDriver.php
@@ -234,6 +234,9 @@ public function switchAction($action, $httpVars, $fileVars)
                     if(!$zipFile) throw new AJXP_Exception("Error while compressing");
                     register_shutdown_function("unlink", $file);
                     $localName = ($base==""?"Files":$base).".zip";
+                    if(isSet($httpVars["archive_name"])){
+                        $localName = AJXP_Utils::decodeSecureMagic($httpVars["archive_name"]);
+                    }
                     $this->readFile($file, "force-download", $localName, false, false, true);
                 } else {
                     $localName = "";