diff --git a/4chan_x.user.js b/4chan_x.user.js
index d1593e950..1fe1112bb 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -1435,6 +1435,7 @@
         var url;
         this.file = file;
         this.el.title = file.name;
+        if (this === qr.selected) $('#filename', qr.el).textContent = file.name;
         if (file.type === 'application/pdf') {
           this.el.style.backgroundImage = null;
           return;
@@ -1459,6 +1460,7 @@
           data = _ref2[_i];
           $("[name=" + data + "]", qr.el).value = this[data];
         }
+        $('#filename', qr.el).textContent = this.file ? this.file.name : null;
         return $('#spoiler', qr.el).checked = this.spoiler;
       };
 
@@ -1568,7 +1570,7 @@
       });
       qr.mimeTypes = mimeTypes.split(', ');
       qr.spoiler = !!$('#com_submit + label');
-      qr.el = ui.dialog('qr', 'top:0;right:0;', "<div class=move>  Quick Reply <input type=checkbox name=autohide id=autohide title=Auto-hide>  <span>" + (g.REPLY ? '' : threads) + " <a class=close>x</a></span></div><form>  <div><input id=dump class=field type=button title='Dump mode' value=+><input name=name title=Name placeholder=Name class=field size=1><input name=email title=E-mail placeholder=E-mail class=field size=1><input name=sub title=Subject placeholder=Subject class=field size=1></div>  <output id=replies><div><a id=addReply href=javascript:;>+</a></div></output>  <div><textarea name=com title=Comment placeholder=Comment class=field></textarea></div>  <div class=captcha title=Reload><img></div>  <div><input name=captcha title=Verification class=field autocomplete=off size=1></div>  <div><label for=upfile><input type=button value='Select Files' class=button></label><span id=fileInfo></span><input type=submit class=button></div>  <label id=spoilerLabel" + (qr.spoiler ? '' : ' hidden') + "><input type=checkbox id=spoiler> Spoiler Image</label>  <div class=warning></div></form><input type=file id=upfile tabindex=-1 max=" + ($('[name=MAX_FILE_SIZE]').value) + " accept='" + mimeTypes + "' multiple>");
+      qr.el = ui.dialog('qr', 'top:0;right:0;', "<div class=move>  Quick Reply <input type=checkbox name=autohide id=autohide title=Auto-hide>  <span>" + (g.REPLY ? '' : threads) + " <a class=close>x</a></span></div><form>  <div><input id=dump class=field type=button title='Dump mode' value=+><input name=name title=Name placeholder=Name class=field size=1><input name=email title=E-mail placeholder=E-mail class=field size=1><input name=sub title=Subject placeholder=Subject class=field size=1></div>  <output id=replies><div><a id=addReply href=javascript:;>+</a></div></output>  <div><textarea name=com title=Comment placeholder=Comment class=field></textarea></div>  <div class=captcha title=Reload><img></div>  <div><input name=captcha title=Verification class=field autocomplete=off size=1></div>  <div><label for=upfile><input type=button value='Select Files' class=button></label><span id=filename></span><input type=submit class=button></div>  <label id=spoilerLabel" + (qr.spoiler ? '' : ' hidden') + "><input type=checkbox id=spoiler> Spoiler Image</label>  <div class=warning></div></form><input type=file id=upfile tabindex=-1 max=" + ($('[name=MAX_FILE_SIZE]').value) + " accept='" + mimeTypes + "' multiple>");
       if (!g.REPLY) {
         $.on($('select', qr.el), 'mousedown', function(e) {
           return e.stopPropagation();
@@ -3659,7 +3661,7 @@ textarea.field {\
   position: absolute;\
   visibility: hidden;\
 }\
-#fileInfo {\
+#filename {\
   box-sizing: border-box;\
   -moz-box-sizing: border-box;\
   display: inline-block;\
diff --git a/script.coffee b/script.coffee
index 7fd298704..f7965b69c 100644
--- a/script.coffee
+++ b/script.coffee
@@ -1052,6 +1052,8 @@ qr =
       qr.replies.push @
     setFile: (@file) ->
       @el.title = file.name
+      if @ is qr.selected
+        $('#filename', qr.el).textContent = file.name
       if file.type is 'application/pdf'
         @el.style.backgroundImage = null
         return
@@ -1070,7 +1072,8 @@ qr =
       @el.parentNode.scrollLeft += rectEl.left + rectEl.width/2 - rectList.left - rectList.width/2
       for data in ['name', 'email', 'sub', 'com']
         $("[name=#{data}]", qr.el).value = @[data]
-      $('#spoiler', qr.el).checked = @spoiler
+      $('#filename', qr.el).textContent  = if @file then @file.name else null
+      $('#spoiler',  qr.el).checked      = @spoiler
     rm: ->
       $.rm @el
       index = qr.replies.indexOf @
@@ -1158,7 +1161,7 @@ qr =
   <div><textarea name=com title=Comment placeholder=Comment class=field></textarea></div>
   <div class=captcha title=Reload><img></div>
   <div><input name=captcha title=Verification class=field autocomplete=off size=1></div>
-  <div><label for=upfile><input type=button value='Select Files' class=button></label><span id=fileInfo></span><input type=submit class=button></div>
+  <div><label for=upfile><input type=button value='Select Files' class=button></label><span id=filename></span><input type=submit class=button></div>
   <label id=spoilerLabel#{if qr.spoiler then '' else ' hidden'}><input type=checkbox id=spoiler> Spoiler Image</label>
   <div class=warning></div>
 </form>
@@ -2896,7 +2899,7 @@ textarea.field {
   position: absolute;
   visibility: hidden;
 }
-#fileInfo {
+#filename {
   box-sizing: border-box;
   -moz-box-sizing: border-box;
   display: inline-block;