diff --git a/app/views/posts/partials/show/_edit.html.erb b/app/views/posts/partials/show/_edit.html.erb
index c838e2ecd..c2123c752 100644
--- a/app/views/posts/partials/show/_edit.html.erb
+++ b/app/views/posts/partials/show/_edit.html.erb
@@ -82,20 +82,12 @@
       <span id="open-edit-dialog" class="ui-icon ui-icon-arrow-1-ne" title="detach" style="display: none;" data-shortcut="shift+e"/>
     </div>
 
-    <%= button_tag "Related tags", :id => "related-tags-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub gradient" %>
-
-    <% TagCategory.related_button_list.each do |category| %>
-      <%= button_tag "#{TagCategory.related_button_mapping[category]}", :id => "related-#{category}-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub gradient" %>
-    <% end %>
+    <%= render "related_tags/buttons" %>
   </div>
 
   <div class="input">
     <%= submit_tag "Submit", :class => "ui-button ui-widget ui-corner-all" %>
   </div>
 
-  <div id="related-tags-container">
-    <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>
+  <%= render "related_tags/container" %>
 <% end %>
diff --git a/app/views/related_tags/_buttons.html.erb b/app/views/related_tags/_buttons.html.erb
new file mode 100644
index 000000000..ce9e7e787
--- /dev/null
+++ b/app/views/related_tags/_buttons.html.erb
@@ -0,0 +1,5 @@
+<%= button_tag "Related tags", :id => "related-tags-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub gradient" %>
+
+<% TagCategory.related_button_list.each do |category| %>
+  <%= button_tag "#{TagCategory.related_button_mapping[category]}", :id => "related-#{category}-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub gradient" %>
+<% end %>
diff --git a/app/views/related_tags/_container.html.erb b/app/views/related_tags/_container.html.erb
new file mode 100644
index 000000000..0a4f2c2cd
--- /dev/null
+++ b/app/views/related_tags/_container.html.erb
@@ -0,0 +1,5 @@
+<div id="related-tags-container">
+  <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>
diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb
index 314735a67..09e3d52e2 100644
--- a/app/views/uploads/new.html.erb
+++ b/app/views/uploads/new.html.erb
@@ -97,22 +97,14 @@
             <span id="open-edit-dialog" class="ui-icon ui-icon-arrow-1-ne" title="detach" style="display: none;" data-shortcut="shift+e"/>
           </div>
 
-          <%= button_tag "Related tags", :id => "related-tags-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub gradient" %>
-
-          <% TagCategory.related_button_list.each do |category| %>
-            <%= button_tag "#{TagCategory.related_button_mapping[category]}", :id => "related-#{category}-button", :type => "button", :class => "ui-button ui-widget ui-corner-all sub gradient" %>
-          <% end %>
+          <%= render "related_tags/buttons" %>
         </div>
 
         <div class="input">
           <%= submit_tag "Submit", :id => "submit-button", :class => "large ui-button ui-widget ui-corner-all gradient", data: {disable_with: false} %>
         </div>
 
-        <div id="related-tags-container">
-          <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>
+        <%= render "related_tags/container" %>
       <% end %>
     <% else %>
       <h2 style="margin-bottom: 1em;">You <%= CurrentUser.user.upload_limited_reason %></h2>