diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 526d9f5aeb6..3f486476281 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -101,6 +101,7 @@ class ListController < ApplicationController
   TopTopic.periods.each do |period|
     define_method("top_#{period}") do
       options = build_topic_list_options
+      options[:per_page] = SiteSetting.topics_per_period_in_top_page
       user = list_target_user
       list = TopicQuery.new(user, options).public_send("list_top_#{period}")
       list.more_topics_url = construct_url_with(period, options, "top")
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 253a4b0f055..58e0a0c1c77 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -604,14 +604,15 @@ en:
     post_menu: "Determine which items appear on the post menu, and in what order. Example like|edit|flag|delete|share|bookmark|reply"
     share_links: "Determine which items appear on the share dialog, and in what order. Example twitter|facebook|google+|email"
     track_external_right_clicks: "Track external links that are right clicked (eg: open in new tab) disabled by default because it rewrites URLs"
-    topics_per_page: "How many topics loaded by default on the topics list page"
+    topics_per_page: "How many topics loaded by default on the topics list page, and when loading more topics"
     posts_per_page: "How many posts loaded by default on a topic page, and when loading more posts"
     site_contact_username: "Username for the author of automated private messages sent by the forum"
     send_welcome_message: "Do new users get a welcome private message?"
     suppress_reply_directly_below: "Don't show reply count on a post when there is a single reply directly below"
     suppress_reply_directly_above: "Don't show in-reply-to on a post when there is a single reply directly above"
 
-    topics_per_period_in_top_summary: "How many topics loaded by default on the top topics page"
+    topics_per_period_in_top_summary: "How many topics loaded on the top topics summary"
+    topics_per_period_in_top_page: "How many topics loaded on the top topics page"
 
     allow_index_in_robots_txt: "Site should be indexed by search engines (update robots.txt)"
     email_domains_blacklist: "A pipe-delimited list of email domains that are not allowed. Example: mailinator.com|trashmail.net"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 64ea6237d6f..f64c813c384 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -58,6 +58,8 @@ basic:
     default: 30
   topics_per_period_in_top_summary:
     default: 20
+  topics_per_period_in_top_page:
+    default: 200
 
 users:
   enable_local_logins: