diff --git a/app/assets/javascripts/discourse/components/latest-topic-list-item.js.es6 b/app/assets/javascripts/discourse/components/latest-topic-list-item.js.es6
index 881e5c75b48..07a4c53b2f5 100644
--- a/app/assets/javascripts/discourse/components/latest-topic-list-item.js.es6
+++ b/app/assets/javascripts/discourse/components/latest-topic-list-item.js.es6
@@ -3,6 +3,4 @@ import { showEntrance } from "discourse/components/topic-list-item";
 export default Ember.Component.extend({
   tagName: "tr",
   click: showEntrance,
-  classBindings: ['topic.archived'],
-  attributeBindings: ['topic.id:data-topic-id']
 });
diff --git a/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs b/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
index 999e7cbd48f..ab80c70c21f 100644
--- a/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
@@ -1,27 +1,33 @@
-<td class="topic-poster">
-  {{#with topic.lastPoster as |lastPoster|}}
-    {{#user-link user=lastPoster}}
-      {{avatar lastPoster imageSize="large"}}
-    {{/user-link}}
-  {{/with}}
-</td>
-<td class="main-link">
-  <tr>
-    {{raw "topic-status" topic=topic}}
-    {{topic-link topic}}
-    {{#if topic.featured_link}}
-      {{topic-featured-link topic}}
-    {{/if}}
-    {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
-  </tr>
-  <tr>
-    {{category-link topic.category}}
-    {{discourse-tags topic mode="list"}}
-  </tr>
-</td>
-<td class="topic-stats">
-  {{raw "list/posts-count-column" topic=topic tagName="div"}}
-  <div class="topic-last-activity">
-    <a href="{{topic.lastPostUrl}}" title="{{topic.bumpedAtTitle}}">{{format-date topic.bumpedAt format="tiny" noTitle="true"}}</a>
-  </div>
-</td>
+<table>
+  <tbody>
+    <tr data-topic-id={{topic.id}} class="{{if topic.archived 'archived'}}">
+      <td class="topic-poster">
+        {{#with topic.lastPoster as |lastPoster|}}
+          {{#user-link user=lastPoster}}
+            {{avatar lastPoster imageSize="large"}}
+          {{/user-link}}
+        {{/with}}
+      </td>
+      <td class="main-link">
+        <tr>
+          {{raw "topic-status" topic=topic}}
+          {{topic-link topic}}
+          {{#if topic.featured_link}}
+            {{topic-featured-link topic}}
+          {{/if}}
+          {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
+        </tr>
+        <tr>
+          {{category-link topic.category}}
+          {{discourse-tags topic mode="list"}}
+        </tr>
+      </td>
+      <td class="topic-stats">
+        {{raw "list/posts-count-column" topic=topic tagName="div"}}
+        <div class="topic-last-activity">
+          <a href="{{topic.lastPostUrl}}" title="{{topic.bumpedAtTitle}}">{{format-date topic.bumpedAt format="tiny" noTitle="true"}}</a>
+        </div>
+      </td>
+    </tr>
+  </tbody>
+</table>
diff --git a/app/assets/stylesheets/desktop/category-list.scss b/app/assets/stylesheets/desktop/category-list.scss
index c7cfc0dee50..e6926808ede 100644
--- a/app/assets/stylesheets/desktop/category-list.scss
+++ b/app/assets/stylesheets/desktop/category-list.scss
@@ -115,13 +115,24 @@
   }
 }
 
-.topic-list-latest {
-  th.latest {
-    line-height: 19px;
-  }
-}
+.categories-and-latest {
+
+  .category-list,
+  .topic-list-latest {
+    width: 48%;
+  }
+
+  .category-list {
+    float: left;
+  }
+
+  .topic-list-latest {
+    float: right;
+    th.latest {
+      line-height: 19px;
+    }
+  }
 
-.categories-and-latest, .topic-list-latest {
   .main-link {
     width: 100%;
   }
@@ -147,34 +158,24 @@
     padding-left: 8px;
   }
 
-  .posts {
-    width: 100%;
-    text-align: right;
-    margin-bottom: 10px;
-  }
+  .topic-list {
+    .posts {
+      width: 100%;
+      text-align: right;
+      margin-bottom: 10px;
+    }
 
-  .num.posts a {
-    padding: 0;
-  }
+    .num.posts a {
+      padding: 0;
+    }
 
-  .more-topics,
-  .no-topics {
-    border-bottom: none;
-    td {
-      padding-right: 0;
-      color: $primary;
+    .more-topics,
+    .no-topics {
+      border-bottom: none;
+      td {
+        padding-right: 0;
+        color: $primary;
+      }
     }
   }
 }
-
-.categories-and-latest {
-  .category-list {
-    width: 48%;
-    float: left;
-  }
-
-  .topic-list-latest {
-    width: 48%;
-    float: right;
-  }
-}