diff --git a/browser/base/content/test/general/browser_bug676619.js b/browser/base/content/test/general/browser_bug676619.js
index 890d6c20b6c10..cab141751592a 100644
--- a/browser/base/content/test/general/browser_bug676619.js
+++ b/browser/base/content/test/general/browser_bug676619.js
@@ -54,6 +54,7 @@ async function testLink(link, name) {
   await BrowserTestUtils.closeWindow(win);
 }
 
+
 async function testLocation(link, url) {
   let tabPromise = BrowserTestUtils.waitForNewTab(gBrowser);
 
@@ -78,11 +79,12 @@ async function runTest(url) {
   await testLink("link4", "with-target.txt");
   await testLink("link5", "javascript.txt");
   await testLink("link6", "test.blob");
-  await testLocation("link7", "http://example.com/");
+  await testLink("link7", "test.file");
   await testLink("link8", "download_page_3.txt");
   await testLink("link9", "download_page_3.txt");
   await testLink("link10", "download_page_4.txt");
   await testLink("link11", "download_page_4.txt");
+  await testLocation("link12", "http://example.com/");
 
   BrowserTestUtils.removeTab(tab);
 }
diff --git a/browser/base/content/test/general/download_page.html b/browser/base/content/test/general/download_page.html
index 464697bb36201..b486633fb18db 100644
--- a/browser/base/content/test/general/download_page.html
+++ b/browser/base/content/test/general/download_page.html
@@ -21,6 +21,8 @@
                 download="with-target.txt" id="link4">Download "with-target.txt"</a></li>
         <li><a href="javascript:(1+2)+''"
             download="javascript.txt" id="link5">Download "javascript.txt"</a></li>
+        <li><a href="#" download="test.blob" id=link6>Download "test.blob"</a></li>
+        <li><a href="#" download="test.file" id=link7>Download "test.file"</a></li>
         <li><a href="download_with_content_disposition_header.sjs?inline=download_page_3.txt"
             download="not_used.txt" id="link8">Download "download_page_3.txt"</a></li>
         <li><a href="download_with_content_disposition_header.sjs?attachment=download_page_3.txt"
@@ -29,27 +31,22 @@
             download="download_page_4.txt" id="link10">Download "download_page_4.txt"</a></li>
         <li><a href="download_with_content_disposition_header.sjs?attachment=none"
             download="download_page_4.txt" id="link11">Download "download_page_4.txt"</a></li>
+        <li><a href="http://example.com/"
+                download="example.com" id="link12" target="_blank">Download "example.com"</a></li>
     </ul>
-    <script>
-        var li = document.createElement("li");
-        var a = document.createElement("a");
+    <div id="unload-flag">Okay</div>
 
-        a.href = window.URL.createObjectURL(new Blob(["just text"]));
-        a.download = "test.blob";
-        a.id = "link6";
-        a.textContent = 'Download "test.blob"';
+    <script>
+        let blobURL = window.URL.createObjectURL(new Blob(["just text"]));
+        document.getElementById("link6").href = blobURL;
 
-        li.appendChild(a);
-        document.getElementsByTagName("ul")[0].appendChild(li);
+        let fileURL = window.URL.createObjectURL(new File(["just text"],
+                                                          "wrong-file-name"));
+        document.getElementById("link7").href = fileURL;
 
         window.addEventListener("beforeunload", function(evt) {
             document.getElementById("unload-flag").textContent = "Fail";
         });
     </script>
-    <ul>
-        <li><a href="http://example.com/"
-                download="example.com" id="link7" target="_blank">Download "example.com"</a></li>
-    <ul>
-    <div id="unload-flag">Okay</div>
   </body>
 </html>
diff --git a/dom/file/uri/BlobURLInputStream.cpp b/dom/file/uri/BlobURLInputStream.cpp
index 83a69dc43adb1..3a51154c5301c 100644
--- a/dom/file/uri/BlobURLInputStream.cpp
+++ b/dom/file/uri/BlobURLInputStream.cpp
@@ -469,7 +469,13 @@ nsresult BlobURLInputStream::StoreBlobImplStream(
   if (blobImpl->IsFile()) {
     nsAutoString filename;
     blobImpl->GetName(filename);
-    if (!filename.IsEmpty()) {
+
+    
+    nsString ignored;
+    bool hasName =
+        NS_SUCCEEDED(mChannel->GetContentDispositionFilename(ignored));
+
+    if (!filename.IsEmpty() && !hasName) {
       mChannel->SetContentDispositionFilename(filename);
     }
   }