diff --git a/src/General/css/style.css b/src/General/css/style.css
index 012037f5e..c7dbce227 100755
--- a/src/General/css/style.css
+++ b/src/General/css/style.css
@@ -1443,7 +1443,8 @@ input#qr-filename {
   margin: 0;
   margin-right: 3px;
 }
-#qr.has-spoiler #file-n-submit:not(.has-file) #qr-spoiler-label,
+#qr:not(.has-spoiler) #qr-spoiler-label,
+#file-n-submit:not(.has-file) #qr-spoiler-label,
 .has-file #paste-area,
 .has-file #url-button,
 #file-n-submit:not(.custom-cooldown) #custom-cooldown-button {
@@ -1565,6 +1566,10 @@ a:only-of-type > .remove {
 .remove:hover::after {
   content: " Remove";
 }
+.qr-preview:not(.has-file) label,
+#qr:not(.has-spoiler) .qr-preview-spoiler {
+  display: none;
+}
 .qr-preview > label {
   background: rgba(0,0,0,.5);
   color: #fff;
diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index 85e68f9f5..9ac16480f 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -530,8 +530,6 @@ QR =
     QR.spoiler = !!$ '.postForm input[name=spoiler]'
     if QR.spoiler
       $.addClass QR.nodes.el, 'has-spoiler'
-    else
-      nodes.spoiler.parentElement.hidden = true
 
     if g.BOARD.ID is 'jp' and Conf['sjisPreview']
       $.addClass QR.nodes.el, 'sjis-preview'
diff --git a/src/Posting/QR.post.coffee b/src/Posting/QR.post.coffee
index a94f2dd42..0ce8da11b 100644
--- a/src/Posting/QR.post.coffee
+++ b/src/Posting/QR.post.coffee
@@ -4,21 +4,21 @@ QR.post = class
       className: 'qr-preview'
       draggable: true
       href: 'javascript:;'
-    $.extend el, <%= html('<a class="remove fa fa-times-circle" title="Remove"></a><label hidden><input type="checkbox"> Spoiler</label><span></span>') %>
+    $.extend el, <%= html('<a class="remove fa fa-times-circle" title="Remove"></a><label class="qr-preview-spoiler"><input type="checkbox"> Spoiler</label><span></span>') %>
 
     @nodes =
       el:      el
       rm:      el.firstChild
-      label:   $ 'label', el
-      spoiler: $ 'input', el
+      spoiler: $ '.qr-preview-spoiler input', el
       span:    el.lastChild
 
     $.on el,             'click',  @select
     $.on @nodes.rm,      'click',  (e) => e.stopPropagation(); @rm()
-    $.on @nodes.label,   'click',  (e) -> e.stopPropagation()
     $.on @nodes.spoiler, 'change', (e) =>
       @spoiler = e.target.checked
       QR.nodes.spoiler.checked = @spoiler if @ is QR.selected
+    for label in $$ 'label', el
+      $.on label, 'click', (e) -> e.stopPropagation()
     $.add QR.nodes.dumpList, el
 
     for event in ['dragStart', 'dragEnter', 'dragLeave', 'dragOver', 'dragEnd', 'drop']
@@ -186,7 +186,7 @@ QR.post = class
       @filename  = @file.name
     @filesize = $.bytesToString @file.size
     @checkSize()
-    @nodes.label.hidden = false if QR.spoiler
+    $.addClass @nodes.el, 'has-file'
     QR.captcha.onPostChange()
     URL.revokeObjectURL @URL
     @saveFilename()
@@ -292,7 +292,7 @@ QR.post = class
     @nodes.el.title = null
     QR.nodes.filename.title = ''
     @nodes.el.style.backgroundImage = null
-    @nodes.label.hidden = true if QR.spoiler
+    $.rmClass @nodes.el, 'has-file'
     @showFileData()
     @updateFlashURL()
     URL.revokeObjectURL @URL