diff --git a/app/assets/javascripts/discourse/app/templates/components/bookmark-list.hbs b/app/assets/javascripts/discourse/app/templates/components/bookmark-list.hbs
index 9dbfd967959..a5e6d62b177 100644
--- a/app/assets/javascripts/discourse/app/templates/components/bookmark-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/bookmark-list.hbs
@@ -1,19 +1,19 @@
 {{#conditional-loading-spinner condition=loading}}
   {{#load-more selector=".bookmark-list .bookmark-list-item" action=loadMore}}
     <table class="topic-list bookmark-list">
-      <thead>
+      <thead class="topic-list-header">
         {{#unless site.mobileView}}
-          <th>{{i18n "topic.title"}}</th>
-          <th>&nbsp;</th>
-          <th class="post-metadata">{{i18n "post.bookmarks.updated"}}</th>
-          <th class="post-metadata">{{i18n "activity"}}</th>
+          <th class="topic-list-data">{{i18n "topic.title"}}</th>
+          <th class="topic-list-data">&nbsp;</th>
+          <th class="post-metadata topic-list-data">{{i18n "post.bookmarks.updated"}}</th>
+          <th class="post-metadata topic-list-data">{{i18n "activity"}}</th>
           <th>&nbsp;</th>
         {{/unless}}
       </thead>
-      <tbody>
+      <tbody class="topic-list-body">
         {{#each content as |bookmark|}}
           <tr class="topic-list-item bookmark-list-item">
-            <td class="main-link" role="rowheader">
+            <td class="main-link topic-list-data" role="rowheader">
               <span class="link-top-line">
                 <div class="bookmark-metadata">
                   {{#if bookmark.reminder_at}}
@@ -48,17 +48,17 @@
               <p class="post-excerpt" {{on "click" this.screenExcerptForExternalLink}}>{{html-safe bookmark.excerpt}}</p>
             </td>
             {{#unless site.mobileView}}
-              <td>
+              <td class="topic-list-data">
                 {{#if bookmark.post_user_avatar_template}}
                   <a href={{bookmark.postUser.path}} data-user-card={{bookmark.post_user_username}} class="avatar">
                     {{avatar bookmark.postUser avatarTemplatePath="avatar_template" usernamePath="username" namePath="name" imageSize="small"}}
                   </a>
                 {{/if}}
               </td>
-              <td class="post-metadata">{{format-date bookmark.updated_at format="tiny"}}</td>
+              <td class="post-metadata topic-list-data">{{format-date bookmark.updated_at format="tiny"}}</td>
               {{raw "list/activity-column" topic=bookmark class="num post-metadata" tagName="td"}}
             {{/unless}}
-            <td>
+            <td class="topic-list-data">
               {{bookmark-actions-dropdown
               bookmark=bookmark
               removeBookmark=(action "removeBookmark")
diff --git a/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs b/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs
index afe4706efdf..fb90f865f99 100644
--- a/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs
@@ -6,7 +6,7 @@
     </div>
   </div>
 {{else}}
-  {{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list tr" action=(action "loadMore")}}
+  {{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list .topic-list-item" action=(action "loadMore")}}
     {{topic-dismiss-buttons
       position="top"
       selectedTopics=selected
diff --git a/app/assets/stylesheets/common/components/bookmark-list.scss b/app/assets/stylesheets/common/components/bookmark-list.scss
index 49162d80ebd..d3bbca3a1a0 100644
--- a/app/assets/stylesheets/common/components/bookmark-list.scss
+++ b/app/assets/stylesheets/common/components/bookmark-list.scss
@@ -1,13 +1,13 @@
 $mobile-breakpoint: 700px;
 
 .bookmark-list {
-  th.post-metadata {
+  .topic-list-data.post-metadata {
     text-align: center;
   }
 }
 
 .bookmark-list-item {
-  td.post-metadata {
+  .topic-list-data.post-metadata {
     text-align: center;
   }
   @media (max-width: $mobile-breakpoint) {
@@ -15,7 +15,7 @@ $mobile-breakpoint: 700px;
       padding-right: 0.5em;
     }
   }
-  .main-link {
+  .main-link.topic-list-data {
     .bookmark-status-with-link {
       a.title {
         padding: 0;