diff --git a/app/assets/javascripts/discourse/components/topic-list-item.js.es6 b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
index b2cc394344..19065d41cf 100644
--- a/app/assets/javascripts/discourse/components/topic-list-item.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
@@ -71,6 +71,10 @@ export default Ember.Component.extend(
         classes.push("category-" + topic.get("category.fullSlug"));
       }
 
+      if (topic.get("tags")) {
+        topic.get("tags").forEach(tagName => classes.push("tag-" + tagName));
+      }
+
       if (topic.get("hasExcerpt")) {
         classes.push("has-excerpt");
       }