diff --git a/app/views/forum_topics/_secondary_links.html.erb b/app/views/forum_topics/_secondary_links.html.erb
index a4aede782..636c1329a 100644
--- a/app/views/forum_topics/_secondary_links.html.erb
+++ b/app/views/forum_topics/_secondary_links.html.erb
@@ -7,10 +7,10 @@
     <% if @forum_topic %>
       <li>|</li>
       <li><%= link_to "Reply", new_forum_post_path(:topic_id => @forum_topic.id) %></li>
-      <% unless @forum_topic.new_record? %>
-        <li><%= link_to "Edit", edit_forum_topic_path(@forum_topic) %></li>
+      <% if !@forum_topic.new_record? && @forum_topic.editable_by?(CurrentUser.user) %>
+        <li><%= link_to "Edit topic", edit_forum_topic_path(@forum_topic) %></li>
         <% if CurrentUser.is_moderator? %>
-          <li><%= link_to "Delete", forum_topic_path(@forum_topic), :remote => true, :method => :delete, :confirm => "Do you want to delete this forum topic?" %></li>
+          <li><%= link_to "Delete topic", forum_topic_path(@forum_topic), :remote => true, :method => :delete, :confirm => "Do you want to delete this forum topic?" %></li>
         <% end %>
       <% end %>
     <% end %>