diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less
index b2fbff05ec..9b13c6e926 100644
--- a/awx/ui/client/legacy-styles/ansible-ui.less
+++ b/awx/ui/client/legacy-styles/ansible-ui.less
@@ -905,7 +905,6 @@ input[type="checkbox"].checkbox-no-label {
 /* Display list actions next to search widget */
 .list-actions {
   text-align: right;
-  margin-bottom: 10px;
 
   button {
     margin-left: 4px;
diff --git a/awx/ui/client/legacy-styles/lists.less b/awx/ui/client/legacy-styles/lists.less
index faa4d1d343..55b3242fa1 100644
--- a/awx/ui/client/legacy-styles/lists.less
+++ b/awx/ui/client/legacy-styles/lists.less
@@ -263,3 +263,11 @@ table, tbody {
     background-color: @list-actn-bg-hov !important;
     color: @list-actn-icn-hov;
 }
+
+.List-searchWidget {
+    height: 34px;
+}
+
+.List-searchRow {
+    margin-bottom: 20px;
+}
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index e32a937051..6f824a93fc 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -1653,7 +1653,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                 }
 
                 //html += "<div class=\"well\">\n";
-                html += "<div class=\"row\">\n";
+                html += "<div class=\"row List-searchRow\">\n";
 
                 html += SearchWidget({
                     iterator: collection.iterator,
diff --git a/awx/ui/client/src/shared/generator-helpers.js b/awx/ui/client/src/shared/generator-helpers.js
index 54dd0bc839..1cf426b801 100644
--- a/awx/ui/client/src/shared/generator-helpers.js
+++ b/awx/ui/client/src/shared/generator-helpers.js
@@ -662,8 +662,8 @@ angular.module('GeneratorHelpers', [systemStatus.name])
             modifier = (i === 1) ? '' : i;
 
             if (includeSize) {
-                html += "<div class=\"";
-                html += (size) ? size : "col-lg-4 col-md-6 col-sm-8 col-xs-9";
+                html += "<div class=\"List-searchWidget ";
+                html += (size) ? size : "col-lg-4 col-md-8 col-sm-12 col-xs-12";
                 html += "\" id=\"search-widget-container" + modifier + "\">\n";
             }
 
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 14d9102adb..e9137fb7dc 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
@@ -348,7 +348,7 @@ export default ['$location', '$compile', '$rootScope', 'SearchWidget', 'Paginate
 
                     if (options.showSearch=== undefined || options.showSearch === true) {
                         // Only show the search bar if we are loading results or if we have at least 1 base result
-                        html += "<div class=\"row\" ng-show=\"" + list.iterator + "Loading == true || " + list.iterator + "_active_search == true || (" + list.iterator + "Loading == false && " + list.iterator + "_active_search == false && " + list.iterator + "_total_rows > 0)\">\n";
+                        html += "<div class=\"row List-searchRow\" ng-show=\"" + list.iterator + "Loading == true || " + list.iterator + "_active_search == true || (" + list.iterator + "Loading == false && " + list.iterator + "_active_search == false && " + list.iterator + "_total_rows > 0)\">\n";
                         if (options.searchSize) {
                             html += SearchWidget({
                                 iterator: list.iterator,