diff --git a/4chan_x.user.js b/4chan_x.user.js
index 20763776e..253b76e53 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -3807,9 +3807,9 @@
         a.textContent = Build.shortFilename(filename);
         shortFilename = a.innerHTML;
         a.textContent = filename;
-        filename = a.innerHTML;
+        filename = a.innerHTML.replace(/'/g, ''');
         fileDims = ext === 'pdf' ? 'PDF' : "" + file.width + "x" + file.height;
-        fileInfo = ("<span class=fileText id=fT" + postID + (file.isSpoiler ? " title='" + filename + "'" : '') + ">File: <a href='" + file.url + "' target=_blank>" + file.timestamp + "</a>") + ("-(" + fileSize + ", " + fileDims + (file.isSpoiler ? '' : ", <span title='" + shortFilename + "'>" + filename + "</span>'")) + ")</span>";
+        fileInfo = ("<span class=fileText id=fT" + postID + (file.isSpoiler ? " title='" + filename + "'" : '') + ">File: <a href='" + file.url + "' target=_blank>" + file.timestamp + "</a>") + ("-(" + fileSize + ", " + fileDims + (file.isSpoiler ? '' : ", <span title='" + filename + "'>" + shortFilename + "</span>")) + ")</span>";
         fileHTML = "<div id=f" + postID + " class=file><div class=fileInfo>" + fileInfo + "</div>" + imgSrc + "</div>";
       } else {
         fileHTML = '';
diff --git a/script.coffee b/script.coffee
index 53737cd06..b6fc241b4 100644
--- a/script.coffee
+++ b/script.coffee
@@ -3046,7 +3046,7 @@ Build =
 
       # get html
       a.textContent = filename
-      filename      = a.innerHTML
+      filename      = a.innerHTML.replace /'/g, '&apos;'
 
       fileDims = if ext is 'pdf' then 'PDF' else "#{file.width}x#{file.height}"
       fileInfo = "<span class=fileText id=fT#{postID}#{if file.isSpoiler then " title='#{filename}'" else ''}>File: <a href='#{file.url}' target=_blank>#{file.timestamp}</a>" +
@@ -3054,7 +3054,7 @@ Build =
           if file.isSpoiler
             ''
           else
-            ", <span title='#{shortFilename}'>#{filename}</span>'"
+            ", <span title='#{filename}'>#{shortFilename}</span>"
         }" + ")</span>"
 
       fileHTML = "<div id=f#{postID} class=file><div class=fileInfo>#{fileInfo}</div>#{imgSrc}</div>"