diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index 6f824a93fc..9dcfc06d10 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -1658,7 +1658,8 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                 html += SearchWidget({
                     iterator: collection.iterator,
                     template: collection,
-                    mini: true
+                    mini: true,
+                    ngShow: collection.iterator + "Loading == true || " + collection.iterator + "_active_search == true || (" + collection.iterator + "Loading == false && " + collection.iterator + "_active_search == false && " + collection.iterator + "_total_rows > 0)"
                 });
 
                 html += "<div class=\"col-lg-8\">\n";
diff --git a/awx/ui/client/src/shared/generator-helpers.js b/awx/ui/client/src/shared/generator-helpers.js
index 1cf426b801..5e3fcfe148 100644
--- a/awx/ui/client/src/shared/generator-helpers.js
+++ b/awx/ui/client/src/shared/generator-helpers.js
@@ -632,6 +632,7 @@ angular.module('GeneratorHelpers', [systemStatus.name])
             form = params.template,
             size = params.size,
             includeSize = (params.includeSize === undefined) ? true : params.includeSize,
+            ngShow = (params.ngShow) ? params.ngShow : false,
             i, html = '',
             modifier,
             searchWidgets = (params.searchWidgets) ? params.searchWidgets : 1,
@@ -667,6 +668,10 @@ angular.module('GeneratorHelpers', [systemStatus.name])
                 html += "\" id=\"search-widget-container" + modifier + "\">\n";
             }
 
+            if(ngShow) {
+                html += "<div ng-show=\"" + ngShow + "\">";
+            }
+
             html += "<input id=\"search_value_input\" type=\"text\" ng-hide=\"" + iterator + "SelectShow" + modifier + " || " +
                 iterator + "InputHide" + modifier + "\" " +
                 "class=\"form-control List-searchInput\" ng-model=\"" + iterator + "SearchValue" + modifier + "\" " +
@@ -688,6 +693,10 @@ angular.module('GeneratorHelpers', [systemStatus.name])
 
             html += "<div id=\"search-widget-spacer\" ng-show=\"" + iterator + "SelectShow" + modifier + "\"></div>\n";
 
+            if(ngShow) {
+                html += "</div>";
+            }
+
             if (includeSize) {
                 html += "</div>\n";
             }