diff --git a/app/helpers/trace_helper.rb b/app/helpers/trace_helper.rb
index 3922ce2b3..e5397b0de 100644
--- a/app/helpers/trace_helper.rb
+++ b/app/helpers/trace_helper.rb
@@ -6,4 +6,12 @@ module TraceHelper
       return link_to(tag, :tag => tag, :display_name => @display_name, :page => nil)
     end
   end
+
+  def link_to_page(page)
+    if @action == "mine"
+      return link_to(page, :tag => @tag, :page => page)
+    else
+      return link_to(page, :tag => @tag, :display_name => @display_name, :page => page)
+    end
+  end
 end
diff --git a/app/views/trace/_trace_paging_nav.rhtml b/app/views/trace/_trace_paging_nav.rhtml
index a7e752893..fec83e3da 100644
--- a/app/views/trace/_trace_paging_nav.rhtml
+++ b/app/views/trace/_trace_paging_nav.rhtml
@@ -8,5 +8,5 @@ end %>
 of <%= @trace_pages.item_count %>)
 
 <% if @trace_pages.page_count > 1 %>
- | <%= pagination_links(@trace_pages) %>
+ | <%= pagination_links_each(@trace_pages, {}) { |n| link_to_page(n) } %>
 <% end %>