diff --git a/library/network/get_url b/library/network/get_url
index e2384e4ebd..5c5faa4624 100644
--- a/library/network/get_url
+++ b/library/network/get_url
@@ -169,7 +169,7 @@ def extract_filename_from_headers(headers):
 
     Looks for the content-disposition header and applies a regex.
     Returns the filename if successful, else None."""
-    cont_disp_regex = 'attachment; ?filename="(.+)"'
+    cont_disp_regex = 'attachment; ?filename="?([^"]+)'
     res = None
 
     if 'content-disposition' in headers: