diff --git a/awx/ui/client/lib/components/list/_index.less b/awx/ui/client/lib/components/list/_index.less
index 7b8c31b844..28357c46fb 100644
--- a/awx/ui/client/lib/components/list/_index.less
+++ b/awx/ui/client/lib/components/list/_index.less
@@ -71,25 +71,12 @@
 .at-List-toolbar-item {
     padding: 2px 10px;
     border-left: 1px solid @at-color-list-border;
-    border-right: 1px solid @at-color-list-border;
 
     &:hover {
         cursor: pointer;
         background: @at-gray-f2;
     }
 
-    &:first-of-type {
-        border-right: none;
-    }
-
-    &:last-of-type {
-        border: none;
-    }
-
-    &:first-child {
-        border-left: 1px solid @at-color-list-border;
-    }
-
     &.active {
         background: @at-blue;
         color: @at-white;
@@ -98,12 +85,6 @@
 
 .at-List-toolbarDropdown {
     border-top-right-radius: @at-border-radius;
-    padding: 2px 10px;
-
-    &:hover {
-        cursor: pointer;
-        background: @at-gray-f2;
-    }
 
     &-toggle {
         background: none;
diff --git a/awx/ui/client/lib/components/list/list-toolbar.partial.html b/awx/ui/client/lib/components/list/list-toolbar.partial.html
index 0b29718652..0db249ccce 100644
--- a/awx/ui/client/lib/components/list/list-toolbar.partial.html
+++ b/awx/ui/client/lib/components/list/list-toolbar.partial.html
@@ -1,7 +1,7 @@
 <div class="at-List-toolbar--attached">
     <div ng-class="isCollapsed ? 'active' : ''" ng-if="!sortOnly" class="at-List-toolbar-item" ng-click="onCollapse()">{{ vm.strings.get('toolbar.COMPACT') }}</div>
     <div ng-class="!isCollapsed ? 'active' : ''" ng-if="!sortOnly" class="at-List-toolbar-item" ng-click="onExpand()">{{ vm.strings.get('toolbar.EXPANDED') }}</div>
-    <div ng-if="sortOptions" class="at-List-toolbarDropdown dropdown">
+    <div ng-if="sortOptions" class="at-List-toolbar-item at-List-toolbarDropdown dropdown">
         <button
             class="at-List-toolbarDropdown-toggle dropdown-toggle"
             data-display="static"
diff --git a/awx/ui/client/src/shared/smart-search/smart-search.controller.js b/awx/ui/client/src/shared/smart-search/smart-search.controller.js
index 4a1c486b1b..be3fcd3c12 100644
--- a/awx/ui/client/src/shared/smart-search/smart-search.controller.js
+++ b/awx/ui/client/src/shared/smart-search/smart-search.controller.js
@@ -46,7 +46,7 @@ function SmartSearchController (
                     qs.search(path, queryset).then((res) => {
                         $scope.dataset = res.data;
                         $scope.collection = res.data.results;
-                        $scope.$emit('updateDataset', res.data);
+                        $scope.$emit('updateDataset', res.data, queryset);
                     });
 
                     $scope.searchTerm = null;
@@ -77,7 +77,7 @@ function SmartSearchController (
             }
             $scope.dataset = res.data;
             $scope.collection = res.data.results;
-            $scope.$emit('updateDataset', res.data);
+            $scope.$emit('updateDataset', res.data, queryset);
         });
 
         $scope.searchTerm = null;
@@ -164,7 +164,6 @@ function SmartSearchController (
                     $scope.searchPlaceholder = i18n._('Search');
                 }
             });
-
             listenForTransitionSuccess();
         });
 
@@ -205,7 +204,7 @@ function SmartSearchController (
                     }
                     $scope.dataset = data;
                     $scope.collection = data.results;
-                    $scope.$emit('updateDataset', data);
+                    $scope.$emit('updateDataset', data, queryset);
                 })
                 .catch(() => revertSearch(unmodifiedQueryset));
 
@@ -241,7 +240,7 @@ function SmartSearchController (
                 }
                 $scope.dataset = data;
                 $scope.collection = data.results;
-                $scope.$emit('updateDataset', data);
+                $scope.$emit('updateDataset', data, queryset);
             });
 
         generateSearchTags();
@@ -271,7 +270,7 @@ function SmartSearchController (
                 }
                 $scope.dataset = data;
                 $scope.collection = data.results;
-                $scope.$emit('updateDataset', data);
+                $scope.$emit('updateDataset', data, queryset);
             });
 
         $scope.searchTags = qs.stripDefaultParams(queryset, defaults);