diff --git a/app/assets/javascripts/admin/addon/templates/users-list-show.hbs b/app/assets/javascripts/admin/addon/templates/users-list-show.hbs
index 257d3eea350..1ca38344f64 100644
--- a/app/assets/javascripts/admin/addon/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/users-list-show.hbs
@@ -28,7 +28,7 @@
 </div>
 <LoadMore
   @class="users-list-container"
-  @selector=".users-list tr"
+  @selector=".directory-table .directory-table__cell"
   @action={{action "loadMore"}}
 >
   {{#if this.model}}
diff --git a/app/assets/javascripts/discourse/app/templates/group-index.hbs b/app/assets/javascripts/discourse/app/templates/group-index.hbs
index a5224ec8426..8a2a1d3a20e 100644
--- a/app/assets/javascripts/discourse/app/templates/group-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group-index.hbs
@@ -71,7 +71,7 @@
 
   {{#if this.hasMembers}}
     <LoadMore
-      @selector=".group-members .directory-table-row"
+      @selector=".directory-table .directory-table__cell"
       @action={{action "loadMore"}}
     >
 
diff --git a/app/assets/javascripts/discourse/app/templates/group-requests.hbs b/app/assets/javascripts/discourse/app/templates/group-requests.hbs
index c4ecb91a017..0767ce55f3d 100644
--- a/app/assets/javascripts/discourse/app/templates/group-requests.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group-requests.hbs
@@ -10,7 +10,7 @@
 
   {{#if this.hasRequesters}}
     <LoadMore
-      @selector=".group-members .directory-table__row"
+      @selector=".directory-table .directory-table__cell"
       @action={{action "loadMore"}}
     >
       <ResponsiveTable @className="group-members group-members__requests">
diff --git a/app/assets/javascripts/discourse/app/templates/users.hbs b/app/assets/javascripts/discourse/app/templates/users.hbs
index db11f2f18fa..9dc6a5d0d49 100644
--- a/app/assets/javascripts/discourse/app/templates/users.hbs
+++ b/app/assets/javascripts/discourse/app/templates/users.hbs
@@ -1,5 +1,8 @@
 <DSection @pageClass="users">
-  <LoadMore @selector=".directory tbody tr" @action={{action "loadMore"}}>
+  <LoadMore
+    @selector=".directory-table .directory-table__cell"
+    @action={{action "loadMore"}}
+  >
     <div class="container">
       <div class="users-directory directory">
         <span>