diff --git a/awx/ui/client/src/shared/list-generator/list-generator.factory.js b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
index 3e425a0828..89ae2aac39 100644
--- a/awx/ui/client/src/shared/list-generator/list-generator.factory.js
+++ b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
@@ -171,25 +171,24 @@ export default ['$location', '$compile', '$rootScope', 'Attr', 'Icon',
 
                 if (options.mode !== 'lookup' && (list.well === undefined || list.well)) {
                     html += `<div class="${list.name}List List-well">`;
-                }
+                    // List actions
+                    html += "<div class=\"List-actionHolder\">";
+                    html += "<div class=\"List-actions\">";
+                    html += `<div ng-include="'${templateUrl('shared/list-generator/list-actions')}'">`;
 
-                // List actions
-                html += "<div class=\"List-actionHolder\">";
-                html += "<div class=\"List-actions\">";
-                html += `<div ng-include="'${templateUrl('shared/list-generator/list-actions')}'">`;
+                    for (action in list.actions) {
+                        list.actions[action] = _.defaults(list.actions[action], { dataPlacement: "top" });
+                    }
 
-                for (action in list.actions) {
-                    list.actions[action] = _.defaults(list.actions[action], { dataPlacement: "top" });
+                    html += "</div>";
+                    if (list.toolbarAuxAction) {
+                        html += `<div class="List-auxAction">${list.toolbarAuxAction}</div>`;
+                    }
+                    html += "\n</div>";
+                    html += "</div>";
+                    // End list actions
                 }
 
-                html += "</div>";
-                if (list.toolbarAuxAction) {
-                    html += `<div class="List-auxAction">${list.toolbarAuxAction}</div>`;
-                }
-                html += "\n</div>";
-                html += "</div>";
-                // End list actions
-
                 html += (list.searchRowActions) ? "<div class='row'><div class=\"col-lg-8 col-md-8 col-sm-8 col-xs-12\">" : "";
                 if (list.searchRowActions && !list.searchSize) {
                     list.searchSize = 'col-lg-7 col-md-12 col-sm-12 col-xs-12';
diff --git a/awx/ui/client/src/shared/paginate/paginate.partial.html b/awx/ui/client/src/shared/paginate/paginate.partial.html
index 8001e72da4..7f8dc186c9 100644
--- a/awx/ui/client/src/shared/paginate/paginate.partial.html
+++ b/awx/ui/client/src/shared/paginate/paginate.partial.html
@@ -1,5 +1,5 @@
 <div class="Paginate page-row" ng-hide="dataset.count < 1">
-    <div class="Paginate-wrapper" ng-hide="dataset.count < pageSize">
+    <div class="Paginate-wrapper" ng-hide="dataset.count <= pageSize">
         <ul class="Paginate-controls pagination">
             <!-- first -->
             <li class="Paginate-controls--first Paginate-controls--item" ng-hide="pageRange.length < 10 || {{current}} === 1">