diff --git a/plugins/http-files/src/file_provider.vala b/plugins/http-files/src/file_provider.vala
index 715f3e62..025b7c47 100644
--- a/plugins/http-files/src/file_provider.vala
+++ b/plugins/http-files/src/file_provider.vala
@@ -138,10 +138,11 @@ public class FileProvider : Dino.FileProvider, Object {
     }
 
     private string extract_file_name_from_url(string url) {
-        string ret = Uri.unescape_string(url.substring(url.last_index_of("/") + 1));
+        string ret = url;
         if (ret.contains("#")) {
             ret = ret.substring(0, ret.last_index_of("#"));
         }
+        ret = Uri.unescape_string(ret.substring(ret.last_index_of("/") + 1));
         return ret;
     }