diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js.es6
index f08140142f0..7e370706229 100644
--- a/app/assets/javascripts/discourse/components/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list.js.es6
@@ -29,6 +29,8 @@ export default Ember.Component.extend({
     return !!this.get("changeSort");
   },
 
+  skipHeader: Ember.computed.reads("site.mobileView"),
+
   @computed("order")
   showLikes(order) {
     return order === "likes";
diff --git a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
index 727715048ee..d1d105121ef 100644
--- a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
@@ -17,7 +17,7 @@
                  bulkSelectEnabled=bulkSelectEnabled
                  canBulkSelect=canBulkSelect
                  selected=selected
-                 skipHeader=site.mobileView
+                 skipHeader=skipHeader
                  tagsForUser=tagsForUser}}
   {{else}}
     {{#unless loadingMore}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-list.hbs b/app/assets/javascripts/discourse/templates/components/topic-list.hbs
index cb9d4ab320e..46e05f4e4d6 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-list.hbs
@@ -1,4 +1,4 @@
-{{#unless site.mobileView}}
+{{#unless skipHeader}}
   <thead>
     {{raw "topic-list-header"
       canBulkSelect=canBulkSelect