diff --git a/js/multi-image.js b/js/multi-image.js
index 5866e2e4..32d1f256 100644
--- a/js/multi-image.js
+++ b/js/multi-image.js
@@ -14,12 +14,11 @@ function multi_image() {
     
     $(document).on('click', 'a.add_image', function(e) {
         e.preventDefault();
-        $('#upload_url').remove();
 
         var images_len = $('form:not([id="quick-reply"]) [type=file]').length;
         
         if (!(images_len >= max_images)) {
-            $('.add_image').after('<br/><input type="file" name="file'+(images_len+1)+'" id="upload_file'+(images_len+1)+'">');
+            $('.add_image').after('<br class="file_separator"/><input type="file" name="file'+(images_len+1)+'" id="upload_file'+(images_len+1)+'">');
             if (typeof setup_form !== 'undefined') setup_form($('form[name="post"]'));
         }
     })
diff --git a/js/upload-selection.js b/js/upload-selection.js
index 80dd0eaf..e2032748 100644
--- a/js/upload-selection.js
+++ b/js/upload-selection.js
@@ -20,11 +20,16 @@ $(function(){
 
   var disable_all = function() {
     $("#upload").hide();
-    $("#upload_file").hide();
+    $("[id^=upload_file]").hide();
+    $(".file_separator").hide();
     $("#upload_url").hide();
     $("#upload_embed").hide();
     $(".add_image").hide();
 
+    $('[id^=upload_file]').each(function(i, v) {
+        $(v).val('');
+    });
+
     if (enabled_oekaki) {
       if (window.oekaki.initialized) {
         window.oekaki.deinit();
@@ -35,7 +40,8 @@ $(function(){
   enable_file = function() {
     disable_all();
     $("#upload").show();
-    $("#upload_file").show();
+    $(".file_separator").show();
+    $("[id^=upload_file]").show();
     $(".add_image").show();
   };