diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js
index be5d556f3..bea5ac5d0 100644
--- a/app/assets/javascripts/posts.js
+++ b/app/assets/javascripts/posts.js
@@ -28,16 +28,19 @@
       this.initialize_post_image_resize_links();
       this.initialize_post_image_resize_to_window_link();
       this.initialize_similar();
-      this.initialize_edit_dialog();
 
       if (Danbooru.meta("always-resize-images") === "true") {
         $("#image-resize-to-window-link").click();
       }
     }
+
+    if ($("#image").length) {
+      this.initialize_edit_dialog();
+    }
   }
 
   Danbooru.Post.initialize_edit_dialog = function(e) {
-    $("#open-post-edit-dialog").button().click(this.open_edit_dialog);
+    $("#open-edit-dialog").button().show().click(this.open_edit_dialog);
 
     $("#toggle-related-tags-link").click(function(e) {
       if ($("#related-tags").is(":visible")) {
@@ -53,22 +56,23 @@
   }
 
   Danbooru.Post.open_edit_dialog = function(e) {
-    $("div.input:has(#post_tag_string)").prevAll().hide();
-    $("#open-post-edit-dialog").hide();
+    var $tag_string = $("#post_tag_string,#upload_tag_string");
+    $("div.input").has($tag_string).prevAll().hide();
+    $("#open-edit-dialog").hide();
 
     $("#toggle-related-tags-link").show().click();
 
-    $("#post_tag_string").css({"resize": "none", "width": "100%"});
+    $tag_string.css({"resize": "none", "width": "100%"});
 
     $(window).scrollTop($("#image").offset().top);
-    var dialog = $("<div/>").attr("id", "post-edit-dialog");
+    var dialog = $("<div/>").attr("id", "edit-dialog");
     $("#form").appendTo(dialog);
     dialog.dialog({
-      title: "Edit",
+      title: "Edit tags",
       width: "auto",
       drag: function(e, ui) {
         if (Danbooru.meta("enable-auto-complete") === "true") {
-          $("#post_tag_string").data("uiAutocomplete").close();
+          $tag_string.data("uiAutocomplete").close();
         }
       },
       close: Danbooru.Post.close_edit_dialog
@@ -86,13 +90,14 @@
   }
 
   Danbooru.Post.close_edit_dialog = function(e, ui) {
-    $("#form").appendTo($("#edit"));
-    $("#post-edit-dialog").remove();
+    $("#form").appendTo($("#c-posts #edit,#c-uploads #a-new"));
+    $("#edit-dialog").remove();
     $("#related-tags").show();
     $("#toggle-related-tags-link").html("&raquo;").hide();
-    $("div.input:has(#post_tag_string)").prevAll().show();
-    $("#open-post-edit-dialog").show();
-    $("#post_tag_string").css({"resize": "", "width": ""});
+    var $tag_string = $("#post_tag_string,#upload_tag_string");
+    $("div.input").has($tag_string).prevAll().show();
+    $("#open-edit-dialog").show();
+    $tag_string.css({"resize": "", "width": ""});
   }
 
   Danbooru.Post.initialize_tag_autocomplete = function() {
diff --git a/app/views/posts/partials/show/_edit.html.erb b/app/views/posts/partials/show/_edit.html.erb
index 05710ccac..12f7fd7b0 100644
--- a/app/views/posts/partials/show/_edit.html.erb
+++ b/app/views/posts/partials/show/_edit.html.erb
@@ -63,7 +63,7 @@
     <div>
       <%= f.label :tag_string, "Tags" %>
       <%= f.text_area :tag_string, :size => "50x5", :value => post.presenter.categorized_tag_string + " " %>
-      <span id="open-post-edit-dialog" class="ui-icon ui-icon-arrow-1-ne" title="detach"/>
+      <span id="open-edit-dialog" class="ui-icon ui-icon-arrow-1-ne" title="detach" style="display: none;"/>
     </div>
 
     <%= button_tag "Related tags", :id => "related-tags-button", :type => "button" %>
diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb
index 9b9d412e2..43ca94f33 100644
--- a/app/views/uploads/new.html.erb
+++ b/app/views/uploads/new.html.erb
@@ -58,6 +58,7 @@
         <div>
           <%= f.label :tag_string, "Tags" %>
           <%= f.text_area :tag_string, :size => "60x5" %>
+          <span id="open-edit-dialog" class="ui-icon ui-icon-arrow-1-ne" title="detach" style="display: none;"/>
         </div>
 
         <%= button_tag "Related tags", :id => "related-tags-button", :type => "button" %>
@@ -77,7 +78,7 @@
       </div>
 
       <div id="related-tags-container">
-        <h1>Related Tags</h1>
+        <h1>Related Tags <a href="#" id="toggle-related-tags-link" style="display: none;">&laquo;</a></h1>
         <div id="related-tags" class="related-tags">
         </div>
       </div>