diff --git a/plugins/c9.vfs.server/download.js b/plugins/c9.vfs.server/download.js
index ec26e2ca..c064dce6 100644
--- a/plugins/c9.vfs.server/download.js
+++ b/plugins/c9.vfs.server/download.js
@@ -44,7 +44,7 @@ define(function(require, exports, module) {
                     filename += (paths.length > 1 ? "[+" + (paths.length - 1) + "]"  : "") + ".tar.gz";
                 }
             }
-            var filenameHeader = "attachment; filename*=utf-8''" + encodeURIComponent(filename);
+            var filenameHeader = "attachment; filename*=utf-8''" + escape(filename);
 
             var process;
             req.on("close", function() {