diff --git a/awx/ui/client/legacy-styles/lists.less b/awx/ui/client/legacy-styles/lists.less
index 93e5c62656..68c0df4eca 100644
--- a/awx/ui/client/legacy-styles/lists.less
+++ b/awx/ui/client/legacy-styles/lists.less
@@ -151,6 +151,7 @@ table, tbody {
 .List-header {
     display: flex;
     align-items: center;
+    min-height: 34px;
 }
 
 .List-title {
diff --git a/awx/ui/client/src/organizations/linkout/organizations-linkout.controller.js b/awx/ui/client/src/organizations/linkout/organizations-linkout.controller.js
index 6609f1f624..5568f8eb7e 100644
--- a/awx/ui/client/src/organizations/linkout/organizations-linkout.controller.js
+++ b/awx/ui/client/src/organizations/linkout/organizations-linkout.controller.js
@@ -59,7 +59,6 @@ export default ['$scope', '$stateParams', '$state', 'Rest', 'UserList', 'Invento
                 list,
                 url,
                 generator = GenerateList;
-            $scope.$parent.hideListHeader = true;
             $scope.$parent.activeCard = parseInt($stateParams.organization_id);
             $scope.$parent.activeMode = mode;
 
diff --git a/awx/ui/client/src/organizations/list/organizations-list.controller.js b/awx/ui/client/src/organizations/list/organizations-list.controller.js
index 0b73fdf75d..4d90a227e0 100644
--- a/awx/ui/client/src/organizations/list/organizations-list.controller.js
+++ b/awx/ui/client/src/organizations/list/organizations-list.controller.js
@@ -122,7 +122,6 @@ export default ['$stateParams', '$scope', '$rootScope', '$location',
                         return card;
                     });
                 }
-                $scope.hideListHeader = false;
             }
         });
 
@@ -131,14 +130,6 @@ export default ['$stateParams', '$scope', '$rootScope', '$location',
             getOrganization(id);
         });
 
-        $scope.$on("HideOrgListHeader", function() {
-            $scope.hideListHeader = true;
-        });
-
-        $scope.$on("ShowOrgListHeader", function() {
-            $scope.hideListHeader = false;
-        });
-
         getOrganization();
 
         $rootScope.flashMessage = null;
diff --git a/awx/ui/client/src/organizations/list/organizations-list.partial.html b/awx/ui/client/src/organizations/list/organizations-list.partial.html
index 8a7948f6a1..abcbf34906 100644
--- a/awx/ui/client/src/organizations/list/organizations-list.partial.html
+++ b/awx/ui/client/src/organizations/list/organizations-list.partial.html
@@ -1,6 +1,6 @@
 <div class="tab-pane" id="organizations">
     <div ui-view></div>
-    <div ng-cloak id="htmlTemplate" class="Panel" ng-hide="hideListHeader">
+    <div ng-cloak id="htmlTemplate" class="Panel">
         <div class="List-header">
             <div class="List-title">
                 <div class="List-titleText">
@@ -18,46 +18,46 @@
                 </button>
             </div>
         </div>
-    </div>
-    <div class="OrgCards">
-        <div class="OrgCards-card"
-            ng-class="{'OrgCards-card--selected': activeCard === card.id || card.isActiveCard }"
-            ng-repeat="card in orgCards track by card.id">
-            <div class="OrgCards-header">
-                <h3 class="OrgCards-label">{{ card.name }}</h3>
-                <div class="OrgCards-actionItems">
-                    <button class="OrgCards-actionItem
-                        List-actionButton"
-                        ng-class="{'List-editButton--selected': (activeCard === card.id || card.isActiveCard) && activeMode === 'edit' }"
-                        ng-click="editOrganization(card.id)">
-                        <i class="OrgCards-actionItemIcon fa fa-pencil">
-                        </i>
-                    </button>
-                    <button class="OrgCards-actionItem List-actionButton
-                        List-actionButton--delete"
-                        ng-click="deleteOrganization(card.id, card.name)">
-                        <i class="OrgCards-actionItemIcon
-                            fa fa-trash-o">
-                        </i>
-                    </button>
+        <div class="OrgCards">
+            <div class="OrgCards-card"
+                ng-class="{'OrgCards-card--selected': activeCard === card.id || card.isActiveCard }"
+                ng-repeat="card in orgCards track by card.id">
+                <div class="OrgCards-header">
+                    <h3 class="OrgCards-label">{{ card.name }}</h3>
+                    <div class="OrgCards-actionItems">
+                        <button class="OrgCards-actionItem
+                            List-actionButton"
+                            ng-class="{'List-editButton--selected': (activeCard === card.id || card.isActiveCard) && activeMode === 'edit' }"
+                            ng-click="editOrganization(card.id)">
+                            <i class="OrgCards-actionItemIcon fa fa-pencil">
+                            </i>
+                        </button>
+                        <button class="OrgCards-actionItem List-actionButton
+                            List-actionButton--delete"
+                            ng-click="deleteOrganization(card.id, card.name)">
+                            <i class="OrgCards-actionItemIcon
+                                fa fa-trash-o">
+                            </i>
+                        </button>
+                    </div>
                 </div>
-            </div>
-            <p class="OrgCards-description">{{ card.description || "Place organization description here" }}</p>
-            <div class="OrgCards-links">
-                <div class="OrgCards-link" ng-repeat="link in card.links">
-                    <span class="badge List-titleBadge
-                        OrgCards-linkBadge"
-                        ng-class="{'List-titleBadge--selected': (activeCard === card.id || card.isActiveCard) && activeMode === link.activeMode }">
-                        {{ link.count }}
-                    </span>
-                    <a class="OrgCards-linkName"
-                        ng-href="{{ link.href }}">
-                        {{ link.name }}
-                    </a>
+                <p class="OrgCards-description">{{ card.description || "Place organization description here" }}</p>
+                <div class="OrgCards-links">
+                    <div class="OrgCards-link" ng-repeat="link in card.links">
+                        <span class="badge List-titleBadge
+                            OrgCards-linkBadge"
+                            ng-class="{'List-titleBadge--selected': (activeCard === card.id || card.isActiveCard) && activeMode === link.activeMode }">
+                            {{ link.count }}
+                        </span>
+                        <a class="OrgCards-linkName"
+                            ng-href="{{ link.href }}">
+                            {{ link.name }}
+                        </a>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
-    <div id="pagination-container" ng-hide="organization_num_pages < 2">
+        <div id="pagination-container" ng-hide="organization_num_pages < 2">
+        </div>
     </div>
 </div>
diff --git a/awx/ui/client/src/search/tagSearch.block.less b/awx/ui/client/src/search/tagSearch.block.less
index 47cd5d4f3e..7f20a1553a 100644
--- a/awx/ui/client/src/search/tagSearch.block.less
+++ b/awx/ui/client/src/search/tagSearch.block.less
@@ -2,6 +2,7 @@
 
 .TagSearch {
     margin-bottom: 10px;
+    min-height: 45px;
 }
 
 .TagSearch-bar {