diff --git a/src/browser/main.js b/src/browser/main.js
index 5027d435..1aa23247 100644
--- a/src/browser/main.js
+++ b/src/browser/main.js
@@ -1573,7 +1573,7 @@
             elem.onclick = function(e)
             {
                 let buffer = emulator.disk_images[type];
-                let filename = settings.id + (type === "cdrom" ? ".iso" : ".img");
+                let filename = buffer.file && buffer.file.name || (settings.id + (type === "cdrom" ? ".iso" : ".img"));
 
                 if(buffer.get_as_file)
                 {