diff --git a/app/assets/javascripts/discourse/controllers/list_controller.js.coffee b/app/assets/javascripts/discourse/controllers/list_controller.js.coffee
index 4be14f1d9..987845cba 100644
--- a/app/assets/javascripts/discourse/controllers/list_controller.js.coffee
+++ b/app/assets/javascripts/discourse/controllers/list_controller.js.coffee
@@ -39,6 +39,7 @@ Discourse.ListController = Ember.Controller.extend Discourse.Presence,
         Discourse.TopicList.list(current).then (items) =>
           @set('filterSummary', items.filter_summary)
           @set('filterMode', filterMode)
+          @set('allLoaded', true) unless items.more_topics_url
           @set('loading', false)
           deferred.resolve(items)
 
diff --git a/app/assets/javascripts/discourse/routes/filtered_list_route.js.coffee b/app/assets/javascripts/discourse/routes/filtered_list_route.js.coffee
index 660e54d9e..38da79204 100644
--- a/app/assets/javascripts/discourse/routes/filtered_list_route.js.coffee
+++ b/app/assets/javascripts/discourse/routes/filtered_list_route.js.coffee
@@ -5,6 +5,9 @@ window.Discourse.FilteredListRoute = Discourse.Route.extend
     listController = @controllerFor('list')
     listController.set('canCreateTopic', false)
     listController.set('filterMode', '')
+    listController.set('allLoaded', false)
+
+
   renderTemplate: ->
     @render 'listTopics', into: 'list', outlet: 'listView', controller: 'listTopics'
   setupController: ->
diff --git a/app/assets/javascripts/discourse/templates/list/list.js.handlebars b/app/assets/javascripts/discourse/templates/list/list.js.handlebars
index 099426789..b4a83d6f9 100644
--- a/app/assets/javascripts/discourse/templates/list/list.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/list/list.js.handlebars
@@ -35,8 +35,10 @@
         {{/if}}
 
         {{outlet listView}}
-
-        <h3>No more topics in this category. <a href="/categories">Browse all categories</a> or <a href="/">view popular topics</a></h3>
+        
+        {{#if controller.allLoaded}}
+          {{{i18n topics.footer}}}
+        {{/if}}
       </div>
     </div>
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index d7a26c1ec..1692cde10 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -314,6 +314,7 @@ en:
       no_read: "You haven't read any topics yet."
       no_posted: "You haven't posted in any topics yet."
       no_popular: "There are no popular topics. That's sad."
+      footer: "No more topics in this category. <a href=\"/categories\">Browse all categories</a> or <a href=\"/\">view popular topics</a>"
 
     topic:      
       create_in: 'Create {{categoryName}} Topic'