diff --git a/app/assets/javascripts/discourse/routes/discovery_top_routes.js b/app/assets/javascripts/discourse/routes/discovery_top_routes.js
index ff0fd8e1d42..f8c960881c9 100644
--- a/app/assets/javascripts/discourse/routes/discovery_top_routes.js
+++ b/app/assets/javascripts/discourse/routes/discovery_top_routes.js
@@ -26,7 +26,7 @@ Discourse.DiscoveryTopRoute = Discourse.Route.extend(Discourse.OpenComposer, {
 
   renderTemplate: function() {
     this.render('navigation/default', { outlet: 'navigation-bar' });
-    this.render('discovery/topics', { outlet: 'list-container' });
+    this.render('discovery/top', { outlet: 'list-container' });
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/templates/discovery/top.js.handlebars b/app/assets/javascripts/discourse/templates/discovery/top.js.handlebars
index 5bc38730942..270702b9ba3 100644
--- a/app/assets/javascripts/discourse/templates/discovery/top.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/discovery/top.js.handlebars
@@ -6,7 +6,7 @@
   {{#if topicList}}
     <div class="clearfix">
       {{top-period-chooser period=period}}
-
+      {{basic-topic-list topicList=topicList hideCategory=hideCategory postsAction="showTopicEntrance"}}
       {{#if topicList.topics.length}}<a href="{{unbound period.showMoreUrl}}" class='btn btn-default pull-right'>{{i18n show_more}}</a>{{/if}}
     </div>
   {{/if}}
@@ -17,7 +17,6 @@
       {{#link-to "discovery.categories"}}{{i18n topic.browse_all_categories}}{{/link-to}} {{i18n or}} {{#link-to 'discovery.latest'}}{{i18n topic.view_latest_topics}}{{/link-to}}.
     {{else}}
       {{#link-to "discovery.categories"}}{{i18n topic.browse_all_categories}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n topic.view_latest_topics}}{{/link-to}} {{i18n or}} {{i18n filters.top.other_periods}}
-      <br/>
       {{top-period-buttons period=period}}
     {{/if}}
     </h3>