diff --git a/app/helpers/pagination_helper.rb b/app/helpers/pagination_helper.rb
index 19be63193..ecdbccfd9 100644
--- a/app/helpers/pagination_helper.rb
+++ b/app/helpers/pagination_helper.rb
@@ -27,7 +27,7 @@ module PaginationHelper
     window = 3
     
     if records.current_page >= 2
-      html << link_to("&lt;&lt;", params.merge(:page => 1))
+      html << link_to("&lt;&lt;", params.merge(:page => records.current_page - 1))
     end
     
     if records.total_pages <= (window * 2) + 5
@@ -56,8 +56,8 @@ module PaginationHelper
       html << numbered_paginator_final_item(records.total_pages, records.current_page)
     end
     
-    if records.current_page == records.total_pages
-      html << link_to("&gt;&gt;", params.merge(:page => records.total_pages))
+    if records.current_page < records.total_pages
+      html << link_to("&gt;&gt;", params.merge(:page => records.current_page + 1))
     end
     
     html << "</menu></div>"