diff --git a/app/views/forum_posts/_forum_post.html.erb b/app/views/forum_posts/_forum_post.html.erb
index d7d7cbbc0..c1ebb5cfa 100644
--- a/app/views/forum_posts/_forum_post.html.erb
+++ b/app/views/forum_posts/_forum_post.html.erb
@@ -29,7 +29,7 @@
         <% if forum_post.editable_by?(CurrentUser.user) %>
           <li><%= link_to "Edit", edit_forum_post_path(forum_post.id) %></li>
         <% end %>
-        <li><%= link_to "Parent", forum_topic_path(forum_post.topic) %></li>
+        <li><%= link_to "Parent", forum_topic_path(forum_post.topic, :page => forum_post.forum_topic_page) %></li>
         <li><%= link_to "Permalink", forum_post_path(forum_post) %></li>
       </menu>
     </div>
diff --git a/app/views/forum_posts/show.html.erb b/app/views/forum_posts/show.html.erb
index b8a0af7db..5f6277031 100644
--- a/app/views/forum_posts/show.html.erb
+++ b/app/views/forum_posts/show.html.erb
@@ -1,5 +1,6 @@
 <div id="c-forum-topics">
   <div id="a-show" class="single-forum-post list-of-forum-posts">
+    <h1>Topic: <%= @forum_post.topic.title %></h1>
     <%= render "forum_post", :forum_post => @forum_post %>
   </div>
 </div>