diff --git a/app/controllers/recent_wiki_pages_controller.rb b/app/controllers/recent_wiki_pages_controller.rb
index 29976a9..3dbe083 100644
--- a/app/controllers/recent_wiki_pages_controller.rb
+++ b/app/controllers/recent_wiki_pages_controller.rb
@@ -1,11 +1,13 @@
 class RecentWikiPagesController < ApplicationController
+	def self.pages_with_updated_on
+		WikiPage.with_updated_on
+			.joins(:content)
+			.order("#{WikiContent.table_name}.updated_on DESC")
+	end
+
   def date_index
-    @pages = WikiPage.find :all, 
-      :select => "#{WikiPage.table_name}.*, #{WikiContent.table_name}.updated_on", 
-      :joins => "LEFT JOIN #{WikiContent.table_name} ON #{WikiContent.table_name}.page_id = #{WikiPage.table_name}.id", 
-      :order => "#{WikiContent.table_name}.updated_on DESC"
+    @paginator, @pages = paginate self.class.pages_with_updated_on
     @pages_by_date = @pages.group_by {|p| p.updated_on.to_date}
-    @pages_by_parent_id = @pages.group_by(&:parent_id)
 
     @pages.first.wiki
   end
diff --git a/app/views/my/blocks/_recent_wiki_pages.html.erb b/app/views/my/blocks/_recent_wiki_pages.html.erb
index 33f6cb3..3538767 100644
--- a/app/views/my/blocks/_recent_wiki_pages.html.erb
+++ b/app/views/my/blocks/_recent_wiki_pages.html.erb
@@ -1,6 +1,8 @@
 <%
 #see WikiController::load_pages_for_index
-pages = WikiPage.with_updated_on.find :all, :order => "updated_on DESC", :limit => 10,:include => {:wiki => :project}
+pages = RecentWikiPagesController.pages_with_updated_on
+  .limit(10)
+  .includes(:wiki => :project)
 %>
 
 <span style="display:inline-block"> <h3>Top 10 Most Recent Wiki Pages</h3></span>
diff --git a/app/views/recent_wiki_pages/date_index.html.erb b/app/views/recent_wiki_pages/date_index.html.erb
index 48dd3eb..46607e5 100644
--- a/app/views/recent_wiki_pages/date_index.html.erb
+++ b/app/views/recent_wiki_pages/date_index.html.erb
@@ -13,3 +13,7 @@
 <% end %>
 </ul>
 <% end %>
+
+<span class="pagination">
+  <%= pagination_links_full @paginator, :per_page_links => true %>
+</span>