diff --git a/app/views/comments/_index_by_comment.html.erb b/app/views/comments/_index_by_comment.html.erb
index 0ec786a7b..e70882dfa 100644
--- a/app/views/comments/_index_by_comment.html.erb
+++ b/app/views/comments/_index_by_comment.html.erb
@@ -8,7 +8,7 @@
               <%= link_to(image_tag(comment.post.preview_file_url), post_path(comment.post)) %>
             <% end %>
           </div>
-          <%= render partial: "comments/partials/show/comment", collection: [comment], locals: { dtext_data: DText.preprocess(@comments.map(&:body)) } %>
+          <%= render partial: "comments/partials/show/comment", collection: [comment], locals: { context: :index_by_comment, dtext_data: DText.preprocess(@comments.map(&:body)) } %>
         <% end %>
       <% end %>
     <% end %>
diff --git a/app/views/comments/index_for_post.js.erb b/app/views/comments/index_for_post.js.erb
index 0c0d584ff..af2b8cab0 100644
--- a/app/views/comments/index_for_post.js.erb
+++ b/app/views/comments/index_for_post.js.erb
@@ -1,5 +1,5 @@
 $("#threshold-comments-notice-for-<%= @post.id %>").hide();
 
 var current_comment_section = $("div.comments-for-post[data-post-id=<%= @post.id %>] div.list-of-comments");
-current_comment_section.html("<%= j(render(partial: 'comments/partials/show/comment', collection: @comments, locals: { dtext_data: DText.preprocess(@comments.map(&:body)) })) %>");
+current_comment_section.html("<%= j(render(partial: 'comments/partials/show/comment', collection: @comments, locals: { context: :index_for_post, dtext_data: DText.preprocess(@comments.map(&:body)) })) %>");
 $(window).trigger("danbooru:index_for_post", [<%= @post.id %>]);
diff --git a/app/views/comments/partials/index/_list.html.erb b/app/views/comments/partials/index/_list.html.erb
index d8e816947..be56922dd 100644
--- a/app/views/comments/partials/index/_list.html.erb
+++ b/app/views/comments/partials/index/_list.html.erb
@@ -13,7 +13,7 @@
 
   <div class="list-of-comments list-of-messages">
     <% if comments.present? %>
-      <%= render partial: "comments/partials/show/comment", collection: comments, locals: { dtext_data: DText.preprocess(comments.map(&:body)) } %>
+      <%= render partial: "comments/partials/show/comment", collection: comments, locals: { context: :index_by_post, dtext_data: DText.preprocess(comments.map(&:body)) } %>
     <% elsif post.last_commented_at.present? %>
       <p>There are no visible comments.</p>
     <% else %>
diff --git a/app/views/comments/partials/show/_comment.html.erb b/app/views/comments/partials/show/_comment.html.erb
index 73228ae84..a5cd60b52 100644
--- a/app/views/comments/partials/show/_comment.html.erb
+++ b/app/views/comments/partials/show/_comment.html.erb
@@ -1,3 +1,5 @@
+<%# locals: comment, context, dtext_data %>
+
 <% if CurrentUser.is_moderator? || (params[:search] && params[:search][:is_deleted] =~ /t/) || !comment.is_deleted? %>
   <a name="comment-<%= comment.id %>"></a>
   <article id="comment_<%= comment.id %>" class="comment message"
@@ -28,32 +30,35 @@
       
       <% if CurrentUser.is_member? %>
         <menu>
-          <% if @post || @posts %>
+          <% if context == :index_by_comment %>
+            <li><%= link_to "Reply", new_comment_path(id: comment, comment: { post_id: comment.post_id }), class: "reply-link" %></li>
+          <% else %>
             <li><%= link_to "Reply", new_comment_path(id: comment, comment: { post_id: comment.post_id }), class: "reply-link", remote: true %></li>
-            <% if comment.editable_by?(CurrentUser.user) %>
-              <% if comment.is_deleted? %>
-                <li><%= link_to "Undelete", undelete_comment_path(comment.id), :method => :post, :remote => true %></li>
-              <% else %>
-                <li><%= link_to "Delete", comment_path(comment.id), :data => {:confirm => "Are you sure you want to delete this comment?"}, :method => :delete, :remote => true %></li>
-              <% end %>
-              <li><%= link_to "Edit", edit_comment_path(comment.id), :id => "edit_comment_link_#{comment.id}", :class => "edit_comment_link" %></li>
+          <% end %>
+
+          <% if comment.editable_by?(CurrentUser.user) %>
+            <% if comment.is_deleted? %>
+              <li><%= link_to "Undelete", undelete_comment_path(comment.id), method: :post, remote: true %></li>
+            <% else %>
+              <li><%= link_to "Delete", comment_path(comment.id), "data-confirm": "Are you sure you want to delete this comment?", method: :delete, remote: true %></li>
             <% end %>
-            <li class="comment-vote-up-link">
-              <%= link_to "Vote up", comment_comment_votes_path(comment_id: comment.id, score: "up"), method: :post, remote: true %>
+            <li><%= link_to "Edit", edit_comment_path(comment.id), id: "edit_comment_link_#{comment.id}", class: "edit_comment_link" %></li>
+          <% end %>
+          <li class="comment-vote-up-link">
+            <%= link_to "Vote up", comment_comment_votes_path(comment_id: comment.id, score: "up"), method: :post, remote: true %>
+          </li>
+          <li class="comment-vote-down-link">
+            <%= link_to "Vote down", comment_comment_votes_path(comment_id: comment.id, score: "down"), method: :post, remote: true %>
+          </li>
+          <li class="comment-unvote-link">
+            <%= link_to "Unvote", comment_comment_votes_path(comment_id: comment.id), method: :delete, remote: true %>
+          </li>
+          <% if CurrentUser.is_moderator? %>
+            <li>|</li>
+            <li>
+              <strong>IP</strong>
+              <span><%= link_to_ip comment.creator_ip_addr %></span>
             </li>
-            <li class="comment-vote-down-link">
-              <%= link_to "Vote down", comment_comment_votes_path(comment_id: comment.id, score: "down"), method: :post, remote: true %>
-            </li>
-            <li class="comment-unvote-link">
-              <%= link_to "Unvote", comment_comment_votes_path(comment_id: comment.id), method: :delete, remote: true %>
-            </li>
-            <% if CurrentUser.is_moderator? %>
-              <li>|</li>
-              <li>
-                <strong>IP</strong>
-                <span><%= link_to_ip comment.creator_ip_addr %></span>
-              </li>
-            <% end %>
           <% end %>
         </menu>
         <% if comment.editable_by?(CurrentUser.user) %>