diff --git a/awx/ui/client/features/projects/index.controller.js b/awx/ui/client/features/projects/index.controller.js
index a76b7ef329..4722753e97 100644
--- a/awx/ui/client/features/projects/index.controller.js
+++ b/awx/ui/client/features/projects/index.controller.js
@@ -4,7 +4,7 @@ function IndexProjectsController ($scope, strings, dataset) {
     vm.count = dataset.data.count;
 
     $scope.$on('updateCount', (e, count) => {
-        if (count) {
+        if (typeof count === 'number') {
             vm.count = count;
         }
     });
diff --git a/awx/ui/client/features/projects/projectsList.controller.js b/awx/ui/client/features/projects/projectsList.controller.js
index 34b488d174..fcfecba65f 100644
--- a/awx/ui/client/features/projects/projectsList.controller.js
+++ b/awx/ui/client/features/projects/projectsList.controller.js
@@ -27,6 +27,9 @@ function projectsListController (
     };
     vm.dataset = Dataset.data;
     vm.projects = Dataset.data.results;
+    $scope.$watch('vm.dataset.count', () => {
+        $scope.$emit('updateCount', vm.dataset.count, 'projects');
+    });
     // build tooltips
     _.forEach(vm.projects, buildTooltips);
     $rootScope.flashMessage = null;
diff --git a/awx/ui/client/features/projects/projectsList.view.html b/awx/ui/client/features/projects/projectsList.view.html
index 91438ce64d..78cb78ddf2 100644
--- a/awx/ui/client/features/projects/projectsList.view.html
+++ b/awx/ui/client/features/projects/projectsList.view.html
@@ -21,7 +21,8 @@
     </div>
     <at-list results="vm.projects">
         <at-row ng-repeat="project in vm.projects"
-            ng-class="{'at-Row--active': (project.id === vm.activeId)}">
+            ng-class="{'at-Row--active': (project.id === vm.activeId)}"
+            id="row-{{ project.id }}">
             <div class="at-Row-items">
                 <at-row-item
                     status="{{ project.statusIcon }}"
diff --git a/awx/ui/test/e2e/tests/test-projects-list-actions.js b/awx/ui/test/e2e/tests/test-projects-list-actions.js
index a252160b85..f01921dad5 100644
--- a/awx/ui/test/e2e/tests/test-projects-list-actions.js
+++ b/awx/ui/test/e2e/tests/test-projects-list-actions.js
@@ -31,7 +31,7 @@ module.exports = {
         projects.waitForElementNotVisible('div.spinny');
 
         projects.section.list.expect.element('@badge').text.equal('1');
-        projects.expect.element(`#projects_table tr[id="${data.project.id}"]`).visible;
+        projects.expect.element(`#row-${data.project.id}`).visible;
         projects.expect.element('i[class*="copy"]').visible;
         projects.expect.element('i[class*="copy"]').enabled;
 
diff --git a/awx/ui/test/e2e/tests/test-xss.js b/awx/ui/test/e2e/tests/test-xss.js
index 719fbd3ae2..d33ee0b754 100644
--- a/awx/ui/test/e2e/tests/test-xss.js
+++ b/awx/ui/test/e2e/tests/test-xss.js
@@ -508,36 +508,36 @@ module.exports = {
         client.expect.element('#project_form').visible;
     },
     'check project list for unsanitized content': client => {
-        const itemRow = `#projects_table tr[id="${data.project.id}"]`;
-        const itemName = `${itemRow} td[class*="name-"] a`;
+        const itemRow = `#row-${data.project.id}`;
+        const itemName = `${itemRow} .at-RowItem-header`;
 
-        client.expect.element('div[class*="at-Panel"] smart-search').visible;
-        client.expect.element('div[class*="at-Panel"] smart-search input').enabled;
+        client.expect.element('.at-Panel smart-search').visible;
+        client.expect.element('.at-Panel smart-search input').enabled;
 
-        client.sendKeys('div[class*="at-Panel"] smart-search input', `id:>${data.project.id - 1} id:<${data.project.id + 1}`);
-        client.sendKeys('div[class*="at-Panel"] smart-search input', client.Keys.ENTER);
+        client.sendKeys('.at-Panel smart-search input', `id:>${data.project.id - 1} id:<${data.project.id + 1}`);
+        client.sendKeys('.at-Panel smart-search input', client.Keys.ENTER);
 
-        client.expect.element('div.spinny').visible;
         client.expect.element('div.spinny').not.visible;
 
-        client.expect.element('.List-titleBadge').text.equal('1');
+        client.expect.element('.at-Panel-headingTitleBadge').text.equal('1');
         client.expect.element(itemName).visible;
 
-        client.moveToElement(itemName, 0, 0, () => {
-            client.expect.element(itemName).attribute('aria-describedby');
-
-            client.getAttribute(itemName, 'aria-describedby', ({ value }) => {
-                const tooltip = `#${value}`;
-
-                client.expect.element(tooltip).present;
-                client.expect.element(tooltip).visible;
-
-                client.expect.element('#xss').not.present;
-                client.expect.element('[class=xss]').not.present;
-                client.expect.element(tooltip).attribute('innerHTML')
-                    .contains('&lt;div id="xss" class="xss"&gt;test&lt;/div&gt;');
-            });
-        });
+        // TODO: uncomment when tooltips are added
+        // client.moveToElement(itemName, 0, 0, () => {
+        //     client.expect.element(itemName).attribute('aria-describedby');
+        //
+        //     client.getAttribute(itemName, 'aria-describedby', ({ value }) => {
+        //         const tooltip = `#${value}`;
+        //
+        //         client.expect.element(tooltip).present;
+        //         client.expect.element(tooltip).visible;
+        //
+        //         client.expect.element('#xss').not.present;
+        //         client.expect.element('[class=xss]').not.present;
+        //         client.expect.element(tooltip).attribute('innerHTML')
+        //             .contains('&lt;div id="xss" class="xss"&gt;test&lt;/div&gt;');
+        //     });
+        // });
 
         client.click(`${itemRow} i[class*="trash"]`);