diff --git a/js/file-selector.js b/js/file-selector.js
index f90bfd3b..2d347b3b 100644
--- a/js/file-selector.js
+++ b/js/file-selector.js
@@ -23,7 +23,7 @@ $('<div class="dropzone-wrap" style="display: none;">'+
 			'<div class="file-thumbs"></div>'+
 		'</div>'+
 	'</div>'+
-'</div>').prependTo('#upload td');
+'</div>').prependTo('#upload td.upload-area');
 
 var files = [];
 $('#upload_file').remove();  // remove the original file selector
diff --git a/js/quick-reply.js b/js/quick-reply.js
index f31af6af..926e5880 100644
--- a/js/quick-reply.js
+++ b/js/quick-reply.js
@@ -261,7 +261,7 @@
 						if ($(this).attr('name') == 'spoiler') {
 							$td.find('label').remove();
 							$(this).attr('id', 'q-spoiler-image');
-							$postForm.find('input[type="file"]').parent()
+                                                       $postForm.find('#upload')
 								.removeAttr('colspan')
 								.after($('<td class="spoiler"></td>').append(this, ' ', $('<label for="q-spoiler-image">').text(_('Spoiler Image'))));
 						} else if ($(this).attr('name') == 'no_country') {
diff --git a/templates/post_form.html b/templates/post_form.html
index f70871d4..bf02ad1a 100644
--- a/templates/post_form.html
+++ b/templates/post_form.html
@@ -145,7 +145,7 @@
 			<th>
 				{% trans %}File{% endtrans %}
 			</th>
-			<td>
+                       <td class="upload-area">
 				<input type="file" name="file" id="upload_file">
 
 				{% if config.allow_upload_by_url %}