diff --git a/inc/instance-config.php b/inc/instance-config.php
index fd7fc962..9c8a326c 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -142,6 +142,7 @@
 	$config['additional_javascript'][] = 'js/image-hover.js';
 	$config['additional_javascript'][] = 'js/auto-scroll.js';
 	$config['additional_javascript'][] = 'js/twemoji/twemoji.js';
+	$config['additional_javascript'][] = 'js/multi-image.js';
 	// Oekaki (now depends on config.oekaki so can be in all scripts)
 	$config['additional_javascript'][] = 'js/jquery-ui.custom.min.js';
 	$config['additional_javascript'][] = 'js/wPaint/lib/wColorPicker.min.js';
diff --git a/js/multi-image.js b/js/multi-image.js
index 6199bef0..de9b151e 100644
--- a/js/multi-image.js
+++ b/js/multi-image.js
@@ -21,9 +21,6 @@ function multi_image() {
             var new_file = '<br class="file_separator"/><input type="file" name="file'+(images_len+1)+'" id="upload_file'+(images_len+1)+'">';
 
             $('[type=file]:last').after(new_file);
-            if ($("#quick-reply").length) {
-                $('#quick-reply [type=file]:last').after(new_file);
-            }
             if (typeof setup_form !== 'undefined') setup_form($('form[name="post"]'));
         }
     })
diff --git a/templates/post_form.html b/templates/post_form.html
index 461a0e76..29c7f75d 100644
--- a/templates/post_form.html
+++ b/templates/post_form.html
@@ -180,6 +180,7 @@
 					<label><input title="{% trans %}Raw HTML{% endtrans %}" type="checkbox" name="raw" id="raw">
 					{% trans %}Raw HTML{% endtrans %}</label>
 				</div>{% endif %}
+				{% endif %}
 			
 				{# Should always be at the end #}
 				{% if config.allow_roll %}<div class="dice-option">
@@ -188,7 +189,6 @@
 						<tr><td><input class="dx" name="dx" min="0" type="number"></td><td><input class="dy" name="dy" min="0" type="number"></td><td><input class="dz" name="dz" type="number"></td></tr>
 					</table>
 				</div>{% endif %}
-				{% endif %}
 			</td>
 		</tr>
 		{% if not config.field_disable_password or (mod and post.mod|hasPermission(config.mod.bypass_field_disable, board.uri)) %}<tr>