diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js
index a3d698467..32526e6a3 100644
--- a/app/assets/javascripts/posts.js
+++ b/app/assets/javascripts/posts.js
@@ -236,7 +236,10 @@
         $("#edit").show();
         $("#comments").hide();
         $("#share").hide();
-        $("#post_tag_string").focus();
+        var tag_string_textarea = $("#post_tag_string");
+        var tag_string = tag_string_textarea.val();
+        tag_string_textarea.focus();
+        tag_string_textarea.val("").val(tag_string);
         $("#related-tags-button").trigger("click");
         $("#find-artist-button").trigger("click");
       } else {
diff --git a/app/views/posts/partials/show/_edit.html.erb b/app/views/posts/partials/show/_edit.html.erb
index 288e353a5..cd0988009 100644
--- a/app/views/posts/partials/show/_edit.html.erb
+++ b/app/views/posts/partials/show/_edit.html.erb
@@ -61,7 +61,7 @@
   <div class="input">
     <div>
       <%= f.label :tag_string, "Tags" %>
-      <%= f.text_area :tag_string , :size => "50x3" %>
+      <%= f.text_area :tag_string , :size => "50x3", :value => post.tag_string + " " %>
     </div>
 
     <%= button_tag "Related tags", :id => "related-tags-button", :type => "button" %>