diff --git a/app/assets/javascripts/related_tag.js b/app/assets/javascripts/related_tag.js
index 24cbf7347..45a918064 100644
--- a/app/assets/javascripts/related_tag.js
+++ b/app/assets/javascripts/related_tag.js
@@ -5,6 +5,7 @@
     if ($("#c-posts").length || $("#c-uploads").length) {
       this.initialize_buttons();
       $("#related-tags-container").hide();
+      $("#artist-tags-container").hide();
     }
   }
   
@@ -184,8 +185,8 @@
   }
   
   Danbooru.RelatedTag.process_artist = function(data) {
-    $("#related-tags-container").show();
-    var $dest = $("#related-tags");
+    $("#artist-tags-container").show();
+    var $dest = $("#artist-tags");
     $dest.empty();
     
     if (data.length === 0) {
diff --git a/app/assets/javascripts/uploads.js b/app/assets/javascripts/uploads.js
index 7fc27c82c..e55f56fd7 100644
--- a/app/assets/javascripts/uploads.js
+++ b/app/assets/javascripts/uploads.js
@@ -10,9 +10,7 @@
       this.initialize_image();
       this.initialize_info();
       this.initialize_similar();
-      if (!$("#upload_source").val().match(/pixiv\.net/)) {
-        $("#related-tags-button").trigger("click");
-      }
+      $("#related-tags-button").trigger("click");
     }
   }
   
diff --git a/app/assets/stylesheets/specific/related_tags.css.scss b/app/assets/stylesheets/specific/related_tags.css.scss
index 02b49a666..e54189d7a 100644
--- a/app/assets/stylesheets/specific/related_tags.css.scss
+++ b/app/assets/stylesheets/specific/related_tags.css.scss
@@ -1,6 +1,6 @@
 @import "../common/000_vars.css.scss";
 
-div#related-tags-container {
+div#related-tags-container, div#artist-tags-container {
   padding-right: 2em;
   
   h1 {
@@ -8,7 +8,7 @@ div#related-tags-container {
   }
 }
 
-div#related-tags {
+div#artist-tags {
   overflow: auto;
   width: 100%;
   margin-bottom: 1em;
@@ -22,6 +22,14 @@ div#related-tags {
   div.artist:last-child {
     margin-bottom: 0;
   }
+}
+
+div#related-tags {
+  overflow: auto;
+  width: 100%;
+  margin-bottom: 1em;
+  padding: 1em;
+  background: #EEE;
   
   div.tag-column {
     max-width: 15em;
diff --git a/app/views/posts/partials/show/_edit.html.erb b/app/views/posts/partials/show/_edit.html.erb
index b0da1e22a..2d451a0e6 100644
--- a/app/views/posts/partials/show/_edit.html.erb
+++ b/app/views/posts/partials/show/_edit.html.erb
@@ -74,10 +74,15 @@
     <%= submit_tag "Submit" %>      
   </div>
 
+  <div id="artist-tags-container">
+    <h1>Artist</h1>
+    <div id="artist-tags">
+    </div>
+  </div>
+  
   <div id="related-tags-container">
     <h1>Related Tags</h1>
     <div id="related-tags">
     </div>
   </div>
-
 <% end %>
diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb
index efd319139..286d56c2a 100644
--- a/app/views/uploads/new.html.erb
+++ b/app/views/uploads/new.html.erb
@@ -61,6 +61,12 @@
         <%= submit_tag "Submit", :class => "large" %>
       </div>
 
+      <div id="artist-tags-container">
+        <h1>Artist</h1>
+        <div id="artist-tags">
+        </div>
+      </div>
+
       <div id="related-tags-container">
         <h1>Related Tags</h1>
         <div id="related-tags">