diff --git a/guacamole-tunnel/src/main/webapp/scripts/client-ui.js b/guacamole-tunnel/src/main/webapp/scripts/client-ui.js
index b13bd0c34..b2dfcc586 100644
--- a/guacamole-tunnel/src/main/webapp/scripts/client-ui.js
+++ b/guacamole-tunnel/src/main/webapp/scripts/client-ui.js
@@ -774,7 +774,7 @@ GuacUI.Client.attach = function(guac) {
         blob.oncomplete = function() {
 
             download.ondownload = function() {
-                saveAs(blob.getBlob(), blob.name);
+                saveAs(blob.getBlob(), blob.name.replace(/[\u0080-\uffff]/g, "_").replace(/\s/g, "_"));
             };
 
             download.complete();