diff --git a/resources/css/elements/badges.css b/resources/css/elements/badges.css
index 490f1bca1f1..e9c978e7133 100644
--- a/resources/css/elements/badges.css
+++ b/resources/css/elements/badges.css
@@ -27,7 +27,7 @@
 }
 
 .filter-badge {
-    @apply text-2xs text-gray-800 bg-white border flex items-center rounded-full;
+    @apply text-2xs text-gray-800 bg-white border border-dashed border-gray-600 flex items-center rounded-full;
     height: 1.625rem;
     padding-left: 10px;
 
@@ -44,6 +44,6 @@
     }
 
     &.filter-badge-control {
-        @apply bg-gray-200 border border-gray-500 border-dashed hover:border-gray-600 hover:bg-gray-300;
+        @apply bg-gray-100 border border-solid rounded-full border-gray-500 hover:border-gray-600 hover:bg-gray-200;
     }
 }
diff --git a/resources/js/components/data-list/FieldFilter.vue b/resources/js/components/data-list/FieldFilter.vue
index e3f52cb0789..20b4c7544bc 100644
--- a/resources/js/components/data-list/FieldFilter.vue
+++ b/resources/js/components/data-list/FieldFilter.vue
@@ -1,11 +1,11 @@
 <template>
     <div>
         <div v-if="hasAvailableFieldFilters">
-            <div class="flex flex-col p-4">
+            <div class="flex flex-col p-3">
 
                 <v-select
                     ref="fieldSelect"
-                    :placeholder="__('Select field')"
+                    :placeholder="__('Field')"
                     :options="fieldOptions"
                     :reduce="option => option.value"
                     :value="field"
diff --git a/resources/js/components/data-list/FilterPresets.vue b/resources/js/components/data-list/FilterPresets.vue
index 10682e621e8..7442dcd00ce 100644
--- a/resources/js/components/data-list/FilterPresets.vue
+++ b/resources/js/components/data-list/FilterPresets.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="pr-2">
+    <div class="pt-2 pr-2">
         <div class="flex flex-wrap items-center">
 
             <button class="pill-tab mr-1" :class="{ 'active': ! activePreset }" @click="viewAll" v-text="__('All')" />
@@ -7,28 +7,46 @@
             <template v-for="(preset, handle) in presets">
                 <button class="pill-tab active mr-1" v-if="handle === activePreset">
                     {{ preset.display }}
-                    <button class="opacity-50 hover:opacity-100" @click="showDeleteModal = true">
-                        <span class="w-2 h-2 ml-2 mr-1">&times;</span>
-                    </button>
+                    <dropdown-list class="ml-2" placement="bottom-start">
+                        <template v-slot:trigger>
+                            <button class="opacity-50 hover:opacity-100">
+                                <svg-icon name="micro/chevron-down-xs" class="w-2 h-2" />
+                            </button>
+                        </template>
+                        <dropdown-item :text="__('Duplicate')" @click="createPreset" />
+                        <dropdown-item :text="__('Rename')" @click="renamePreset" />
+                        <div class="divider" />
+                        <dropdown-item :text="__('Delete')" class="warning" @click="deletePreset" />
+                    </dropdown-list>
                 </button>
                 <button class="pill-tab mr-1" v-else @click="viewPreset(handle)">
                     {{ preset.display }}
                 </button>
             </template>
 
-            <button class="pill-tab" @click="createNewEmptyPreset" >
+            <button class="pill-tab" @click="createPreset" v-tooltip="__('Create New View')">
                 <svg-icon name="add" class="w-3 h-3"/>
             </button>
         </div>
 
         <confirmation-modal
-            :buttonText="__('Save')"
+            v-if="showCreateModal"
             :title="__('Create New View')"
-            v-if="showSaveModal"
-            @cancel="showSaveModal = false"
-            @confirm="handleSavePreset"
+            :buttonText="__('Create')"
+            @cancel="showCreateModal = false"
+            @confirm="savePreset(savingPresetSlug)"
         >
-            <text-input :focus="true" v-model="savingPresetName" @keydown.enter="handleSavePreset" />
+            <text-input :focus="true" v-model="savingPresetName" @keydown.enter="savePreset(savingPresetSlug)" />
+        </confirmation-modal>
+
+        <confirmation-modal
+            v-if="showRenameModal"
+            :title="__('Rename View')"
+            :buttonText="__('Rename')"
+            @cancel="showRenameModal = false"
+            @confirm="savePreset()"
+        >
+            <text-input :focus="true" v-model="savingPresetName" @keydown.enter="savePreset()" />
         </confirmation-modal>
 
         <confirmation-modal
@@ -58,8 +76,9 @@ export default {
     data() {
         return {
             presets: [],
+            showCreateModal: false,
+            showRenameModal: false,
             showDeleteModal: false,
-            showSaveModal: false,
             savingPresetName: null,
             test: 'hello!'
         }
@@ -80,6 +99,10 @@ export default {
 
             return payload;
         },
+
+        savingPresetSlug() {
+            return this.$slugify(this.savingPresetName, '_');
+        },
     },
 
     created() {
@@ -98,69 +121,78 @@ export default {
             this.viewPreset(handle)
         },
 
-        deletePreset() {
-            this.$preferences.remove(`${this.preferencesKey}.${this.activePreset}`)
-                .then(response => {
-                    this.$emit('deleted', this.activePreset);
-                    this.$toast.success(__('View deleted'));
-                    this.showDeleteModal = false;
-                    this.refreshPresets();
-                })
-                .catch(error => {
-                    this.$toast.error(__('Unable to delete view'));
-                    this.showDeleteModal = false;
-                });
+        refreshPresets() {
+            this.getPresets();
+            this.viewAll();
         },
 
-        savePreset() {
-            if (!this.activePreset) {
-                this.showSaveModal = true;
-                return;
+        refreshPreset() {
+            if (this.activePreset) {
+                this.setPreset(this.activePreset);
+            } else {
+                this.viewAll();
             }
+        },
 
-            this.handleSavePreset();
+        viewAll() {
+            this.$emit('reset');
         },
 
-        createNewEmptyPreset() {
+        viewPreset(handle) {
+            this.$emit('selected', handle, this.presets[handle]);
+        },
+
+        createPreset() {
             this.savingPresetName = null;
-            this.showSaveModal = true;
+            this.showCreateModal = true;
+        },
+
+        renamePreset() {
+            this.savingPresetName = this.activePresetPayload.display;
+            this.showRenameModal = true;
         },
 
-        handleSavePreset() {
-            let presetHandle = this.activePreset || this.$slugify(this.savingPresetName, '_');
+        savePreset(handle) {
+            let presetHandle = handle || this.activePreset;
+
+            if (! presetHandle) {
+                this.showCreateModal = true;
+                return;
+            }
 
             this.$preferences.set(`${this.preferencesKey}.${presetHandle}`, this.presetPreferencesPayload)
                 .then(response => {
                     this.$toast.success(__('View saved'));
-                    this.showSaveModal = false;
-                    this.getPresets();
-                    this.viewPreset(presetHandle);
-                    this.hasActiveFilters ? this.refreshPreset() : this.$emit('show-filters');
+                    this.showCreateModal = false;
+                    this.showRenameModal = false;
+                    this.setPreset(presetHandle);
                 })
                 .catch(error => {
                     this.$toast.error(__('Unable to save view'));
-                    this.showSaveModal = false;
+                    this.showCreateModal = false;
+                    this.showRenameModal = false;
                 });
         },
 
-        refreshPresets() {
-            this.getPresets();
-            this.viewAll();
-        },
-
-        refreshPreset() {
-            this.getPresets();
-            this.$emit('hide-filters');
-            this.viewPreset(this.activePreset);
-        },
+        deletePreset() {
+            if (! this.showDeleteModal) {
+                this.showDeleteModal = true;
+                return;
+            }
 
-        viewAll() {
-            this.$emit('reset');
+            this.$preferences.remove(`${this.preferencesKey}.${this.activePreset}`)
+                .then(response => {
+                    this.$emit('deleted', this.activePreset);
+                    this.$toast.success(__('View deleted'));
+                    this.showDeleteModal = false;
+                    this.refreshPresets();
+                })
+                .catch(error => {
+                    this.$toast.error(__('Unable to delete view'));
+                    this.showDeleteModal = false;
+                });
         },
 
-        viewPreset(handle) {
-            this.$emit('selected', handle, this.presets[handle]);
-        },
     },
 
 }
diff --git a/resources/js/components/data-list/Filters.vue b/resources/js/components/data-list/Filters.vue
index 44c538e6bc4..ae0ab2b9df9 100644
--- a/resources/js/components/data-list/Filters.vue
+++ b/resources/js/components/data-list/Filters.vue
@@ -1,12 +1,12 @@
 <template>
-    <div class="w-full" v-if="isFiltering || isSearching">
-        <div class="flex flex-wrap px-3 border-b pt-2">
+    <div class="shadow-inner bg-gray-300">
+        <div class="flex items-center flex-wrap px-3 border-b pt-2">
 
             <!-- Field filter (requires custom selection UI) -->
             <popover v-if="fieldFilter" placement="bottom-start" @closed="fieldFilterClosed">
                 <template slot="trigger">
                     <button class="filter-badge filter-badge-control mr-2 mb-2" @click="resetFilterPopover">
-                        {{ __('Field') }}
+                        {{ fieldFilter.title }}
                         <svg-icon name="micro/chevron-down-xs" class="w-2 h-2 mx-2" />
                     </button>
                 </template>
@@ -18,17 +18,7 @@
                                 :config="fieldFilter"
                                 :values="activeFilters.fields || {}"
                                 :badges="fieldFilterBadges"
-                                @changed="$emit('filter-changed', {handle: 'fields', values: $event})"
-                                @cleared="creating = false"
-                                @closed="closePopover"
-                            />
-                            <data-list-filter
-                                v-for="filter in standardFilters"
-                                v-if="creating === filter.handle"
-                                :key="filter.handle"
-                                :filter="filter"
-                                :values="activeFilters[filter.handle]"
-                                @changed="$emit('filter-changed', {handle: filter.handle, values: $event})"
+                                @changed="$emit('changed', {handle: 'fields', values: $event})"
                                 @cleared="creating = false"
                                 @closed="closePopover"
                             />
@@ -37,8 +27,8 @@
                 </template>
             </popover>
 
-            <!-- Standard non-field filters -->
-            <popover v-if="standardFilters.length" v-for="filter in standardFilters" :key="filter.handle" placement="bottom-start">
+            <!-- Standard pinned filters -->
+            <popover v-if="pinnedFilters.length" v-for="filter in pinnedFilters" :key="filter.handle" placement="bottom-start" :stop-propagation="false">
                 <template slot="trigger">
                     <button class="filter-badge filter-badge-control mr-2 mb-2">
                         {{ filter.title }}
@@ -51,13 +41,49 @@
                             :key="filter.handle"
                             :filter="filter"
                             :values="activeFilters[filter.handle]"
-                            @changed="$emit('filter-changed', {handle: filter.handle, values: $event})"
+                            @changed="$emit('changed', {handle: filter.handle, values: $event})"
                             @closed="closePopover"
                         />
                     </div>
                 </template>
             </popover>
 
+            <!-- Standard unpinned filters -->
+            <popover v-if="unpinnedFilters.length" placement="bottom-start" :stop-propagation="false">
+                <template slot="trigger">
+                    <button class="filter-badge filter-badge-control mr-2 mb-2" @click="resetFilterPopover">
+                        {{ __('Filter') }}
+                        <svg-icon name="micro/chevron-down-xs" class="w-2 h-2 mx-2" />
+                    </button>
+                </template>
+                <template #default="{ close: closePopover }">
+                    <div class="filter-fields w-64">
+                        <h6 v-text="creatingFilterHeader" class="p-3 pb-0" />
+                        <div v-if="showUnpinnedFilterSelection" class="p-3 pt-1">
+                            <button
+                                v-for="filter in unpinnedFilters"
+                                :key="filter.handle"
+                                v-text="filter.title"
+                                class="btn w-full mt-1"
+                                @click="creating = filter.handle"
+                            />
+                        </div>
+                        <div v-else>
+                            <data-list-filter
+                                v-for="filter in unpinnedFilters"
+                                v-if="creating === filter.handle"
+                                :key="filter.handle"
+                                :filter="filter"
+                                :values="activeFilters[filter.handle]"
+                                @changed="$emit('changed', {handle: filter.handle, values: $event})"
+                                @cleared="creating = false"
+                                @closed="closePopover"
+                            />
+                        </div>
+                    </div>
+                </template>
+            </popover>
+
             <!-- Active filter badges -->
             <div class="filter-badge mr-2 mb-2" v-for="(badge, handle) in fieldFilterBadges">
                 <span>{{ badge }}</span>
@@ -132,6 +158,28 @@ export default {
             return this.filters.filter(filter => filter.handle !== 'fields');
         },
 
+        pinnedFilters() {
+            return this.standardFilters.filter(filter => filter.pinned);
+        },
+
+        unpinnedFilters() {
+            return this.standardFilters.filter(filter => ! filter.pinned);
+        },
+
+        creatingFilter() {
+            return _.find(this.unpinnedFilters, filter => filter.handle === this.creating);
+        },
+
+        creatingFilterHeader() {
+            let text = data_get(this.creatingFilter, 'title', 'Filter where');
+
+            return __(text) + ':';
+        },
+
+        showUnpinnedFilterSelection() {
+            return ! this.creating;
+        },
+
         fieldFilterBadges() {
             return data_get(this.activeFilterBadges, 'fields', {});
         },
@@ -207,11 +255,11 @@ export default {
 
             delete fields[handle];
 
-            this.$emit('filter-changed', {handle: 'fields', values: fields});
+            this.$emit('changed', {handle: 'fields', values: fields});
         },
 
         removeStandardFilter(handle) {
-            this.$emit('filter-changed', {handle: handle, values: null});
+            this.$emit('changed', {handle: handle, values: null});
         },
 
         save() {
@@ -233,12 +281,6 @@ export default {
                 });
         },
 
-        reset() {
-            return this.activePreset
-                ? this.$emit('restore-preset', this.activePreset)
-                : this.$emit('reset');
-        },
-
         remove() {
             this.$preferences.remove(this.preferencesKey)
                 .then(response => {
diff --git a/resources/js/components/data-list/HasFilters.js b/resources/js/components/data-list/HasFilters.js
index bc0895395ec..2a230e4f44d 100644
--- a/resources/js/components/data-list/HasFilters.js
+++ b/resources/js/components/data-list/HasFilters.js
@@ -7,8 +7,6 @@ export default {
             activePreset: null,
             activePresetPayload: {},
             searchQuery: '',
-            showFilters: this.$config.get('alwaysShowFilters'),
-            alwaysShowFilters: this.$config.get('alwaysShowFilters'),
         }
     },
 
@@ -101,30 +99,10 @@ export default {
             this.activePreset = null;
             this.activePresetPayload = {};
             this.searchQuery = '';
-            this.showFilters = false;
             this.activeFilters = {};
             this.activeFilterBadges = {};
         },
 
-        filtersHide() {
-            this.showFilters = false;
-            this.searchQuery = '';
-        },
-
-        filtersShow() {
-            this.showFilters = true;
-        },
-
-        handleShowFilters() {
-            this.showFilters = true;
-
-            this.$nextTick(function () {
-                if (this.$refs.search) {
-                    this.$refs.search.focus();
-                }
-            });
-        },
-
         unselectAllItems() {
             if (this.$refs.dataList) {
                 this.$refs.dataList.clearSelections();
diff --git a/resources/js/components/data-list/Search.vue b/resources/js/components/data-list/Search.vue
index 84041781a0e..0650d434867 100644
--- a/resources/js/components/data-list/Search.vue
+++ b/resources/js/components/data-list/Search.vue
@@ -7,7 +7,7 @@
         @input="emitEvent"
         @keyup.esc="reset"
         autofocus
-        class="input-text flex-1 bg-white text-sm">
+        class="input-text flex-1 bg-white text-sm focus:border-blue-300 outline-0">
 </template>
 
 <script>
diff --git a/resources/js/components/entries/Listing.vue b/resources/js/components/entries/Listing.vue
index c5bb8faabd6..f4610760a09 100644
--- a/resources/js/components/entries/Listing.vue
+++ b/resources/js/components/entries/Listing.vue
@@ -16,11 +16,10 @@
         >
             <div slot-scope="{ hasSelections }">
                 <div class="card overflow-hidden p-0 relative">
-                    <div class="flex items-center justify-between p-2 text-sm border-b">
+                    <div class="flex flex-wrap items-center justify-between px-2 pb-2 text-sm border-b">
 
                         <data-list-filter-presets
                             ref="presets"
-                            v-show="alwaysShowFilters || ! showFilters"
                             :active-preset="activePreset"
                             :active-preset-payload="activePresetPayload"
                             :active-filters="activeFilters"
@@ -29,23 +28,17 @@
                             :search-query="searchQuery"
                             @selected="selectPreset"
                             @reset="filtersReset"
-                            @hide-filters="filtersHide"
-                            @show-filters="filtersShow"
                         />
 
-                        <data-list-search class="h-8" v-if="showFilters" ref="search" v-model="searchQuery" :placeholder="searchPlaceholder" />
+                        <data-list-search class="h-8 mt-2 min-w-[240px] w-full" ref="search" v-model="searchQuery" :placeholder="searchPlaceholder" />
 
-                        <div class="flex ml-2 space-x-2">
-                            <button class="btn btn-sm" v-text="__('Cancel')" v-show="! alwaysShowFilters && showFilters" @click="filtersHide" />
-                            <button class="btn btn-sm" v-text="__('Save')" v-show="showFilters && isDirty" @click="$refs.presets.savePreset()" />
-                            <button class="btn flex items-center btn-sm w-12" @click="handleShowFilters" v-if="! showFilters" v-tooltip="__('Show Filter Controls (F)')">
-                                <svg-icon name="light/search" class="w-4 h-4" />
-                                <svg-icon name="light/filter-lines" class="w-4 h-4" />
-                            </button>
+                        <div class="flex space-x-2 mt-2">
+                            <button class="btn btn-sm ml-2" v-text="__('Reset')" v-show="isDirty" @click="$refs.presets.refreshPreset()" />
+                            <button class="btn btn-sm ml-2" v-text="__('Save')" v-show="isDirty" @click="$refs.presets.savePreset()" />
                             <data-list-column-picker :preferences-key="preferencesKey('columns')" />
                         </div>
                     </div>
-                    <div v-show="!reordering && showFilters">
+                    <div v-show="!reordering">
                         <data-list-filters
                             ref="filters"
                             :filters="filters"
@@ -55,15 +48,12 @@
                             :active-filter-badges="activeFilterBadges"
                             :active-count="activeFilterCount"
                             :search-query="searchQuery"
-                            :is-searching="showFilters"
+                            :is-searching="true"
                             :saves-presets="true"
                             :preferences-prefix="preferencesPrefix"
-                            @filter-changed="filterChanged"
-                            @search-changed="searchChanged"
+                            @changed="filterChanged"
                             @saved="$refs.presets.setPreset($event)"
                             @deleted="$refs.presets.refreshPresets()"
-                            @restore-preset="$refs.presets.viewPreset($event)"
-                            @reset="filtersReset"
                         />
                     </div>
 
diff --git a/resources/js/components/forms/SubmissionListing.vue b/resources/js/components/forms/SubmissionListing.vue
index a8ceb546749..10e9cac0687 100644
--- a/resources/js/components/forms/SubmissionListing.vue
+++ b/resources/js/components/forms/SubmissionListing.vue
@@ -17,13 +17,10 @@
             @visible-columns-updated="visibleColumns = $event"
         >
             <div slot-scope="{ hasSelections }">
-                <div class="card p-0 relative">
-                    <div class="data-list-header min-h-16">
-                        <data-list-filters
-                            :search-query="searchQuery"
-                            @search-changed="searchChanged"
-                            @reset="filtersReset"
-                        />
+                <div class="card overflow-hidden p-0 relative">
+                    <div class="flex flex-wrap items-center justify-between p-2 text-sm border-b">
+                        <data-list-search class="h-8 min-w-[240px] w-full" ref="search" v-model="searchQuery" :placeholder="searchPlaceholder" />
+                        <data-list-column-picker class="ml-2" :preferences-key="preferencesKey('columns')" />
                     </div>
 
                     <div v-show="items.length === 0" class="p-6 text-center text-gray-500" v-text="__('No results')" />
diff --git a/resources/js/components/inputs/relationship/Selector.vue b/resources/js/components/inputs/relationship/Selector.vue
index 47042f428d8..5f1c8ec04f6 100644
--- a/resources/js/components/inputs/relationship/Selector.vue
+++ b/resources/js/components/inputs/relationship/Selector.vue
@@ -19,8 +19,11 @@
             @selections-updated="selectionsUpdated"
         >
             <div slot-scope="{}" class="flex flex-col h-full">
-                <div class="bg-white border-b flex items-center justify-between bg-gray-200">
-                    <div class="p-4 flex flex-1 items-center">
+                <div class="bg-white bg-gray-200">
+                    <div class="p-2">
+                        <data-list-search class="h-8 min-w-[240px] w-full" ref="search" v-model="searchQuery" :placeholder="searchPlaceholder" />
+                    </div>
+                    <div>
                         <data-list-filters
                             ref="filters"
                             :filters="filters"
@@ -28,9 +31,7 @@
                             :active-filter-badges="activeFilterBadges"
                             :active-count="activeFilterCount"
                             :search-query="searchQuery"
-                            @filter-changed="filterChanged"
-                            @search-changed="searchChanged"
-                            @reset="filtersReset"
+                            @changed="filterChanged"
                         />
                     </div>
                 </div>
diff --git a/resources/js/components/terms/Listing.vue b/resources/js/components/terms/Listing.vue
index c647826d3ca..6073c437b69 100644
--- a/resources/js/components/terms/Listing.vue
+++ b/resources/js/components/terms/Listing.vue
@@ -17,13 +17,10 @@
         >
             <div slot-scope="{ hasSelections }">
                 <div class="card overflow-hidden p-0 relative">
-                    <div class="flex items-center justify-between p-2 text-sm border-b">
-
-                        <data-list-search class="h-8" v-if="showFilters" ref="search" v-model="searchQuery" :placeholder="searchPlaceholder" />
+                    <div class="flex flex-wrap items-center justify-between px-2 pb-2 text-sm border-b">
 
                         <data-list-filter-presets
                             ref="presets"
-                            v-show="! showFilters"
                             :active-preset="activePreset"
                             :active-preset-payload="activePresetPayload"
                             :active-filters="activeFilters"
@@ -32,40 +29,33 @@
                             :search-query="searchQuery"
                             @selected="selectPreset"
                             @reset="filtersReset"
-                            @hide-filters="filtersHide"
-                            @show-filters="filtersShow"
                         />
-                        <div class="flex ml-2 space-x-2">
-                            <button class="btn py-1 px-2 h-8" v-text="__('Cancel')" v-show="showFilters" @click="filtersHide" />
-                            <button class="btn py-1 px-2 h-8" v-text="__('Save')" v-show="showFilters && isDirty" @click="$refs.presets.savePreset()" />
-                            <button class="btn flex items-center py-1 px-2 h-8" @click="handleShowFilters" v-if="! showFilters" v-tooltip="__('Show Filter Controls (F)')">
-                                <svg-icon name="light/search" class="w-4 h-4" />
-                                <svg-icon name="light/filter-lines" class="w-4 h-4" />
-                            </button>
+
+                        <data-list-search class="h-8 mt-2 min-w-[240px] w-full" ref="search" v-model="searchQuery" :placeholder="searchPlaceholder" />
+
+                        <div class="flex space-x-2 mt-2">
+                            <button class="btn btn-sm ml-2" v-text="__('Reset')" v-show="isDirty" @click="$refs.presets.refreshPreset()" />
+                            <button class="btn btn-sm ml-2" v-text="__('Save')" v-show="isDirty" @click="$refs.presets.savePreset()" />
                             <data-list-column-picker :preferences-key="preferencesKey('columns')" />
                         </div>
                     </div>
-                    <div v-show="showFilters">
-                        <data-list-filters
-                            ref="filters"
-                            :filters="filters"
-                            :active-preset="activePreset"
-                            :active-preset-payload="activePresetPayload"
-                            :active-filters="activeFilters"
-                            :active-filter-badges="activeFilterBadges"
-                            :active-count="activeFilterCount"
-                            :search-query="searchQuery"
-                            :is-searching="showFilters"
-                            :saves-presets="true"
-                            :preferences-prefix="preferencesPrefix"
-                            @filter-changed="filterChanged"
-                            @search-changed="searchChanged"
-                            @saved="$refs.presets.setPreset($event)"
-                            @deleted="$refs.presets.refreshPresets()"
-                            @restore-preset="$refs.presets.viewPreset($event)"
-                            @reset="filtersReset"
-                        />
-                    </div>
+
+                    <data-list-filters
+                        ref="filters"
+                        :filters="filters"
+                        :active-preset="activePreset"
+                        :active-preset-payload="activePresetPayload"
+                        :active-filters="activeFilters"
+                        :active-filter-badges="activeFilterBadges"
+                        :active-count="activeFilterCount"
+                        :search-query="searchQuery"
+                        :is-searching="true"
+                        :saves-presets="true"
+                        :preferences-prefix="preferencesPrefix"
+                        @changed="filterChanged"
+                        @saved="$refs.presets.setPreset($event)"
+                        @deleted="$refs.presets.refreshPresets()"
+                    />
 
                     <div v-show="items.length === 0" class="p-6 text-center text-gray-500" v-text="__('No results')" />
 
diff --git a/resources/js/components/users/Listing.vue b/resources/js/components/users/Listing.vue
index 987ec1a267f..7918b37d15c 100644
--- a/resources/js/components/users/Listing.vue
+++ b/resources/js/components/users/Listing.vue
@@ -16,13 +16,11 @@
         >
             <div slot-scope="{ hasSelections }">
                 <div class="card p-0 relative">
-                    <div class="flex items-center justify-between p-2 text-sm border-b">
-
-                        <data-list-search class="h-8" v-if="showFilters" ref="search" v-model="searchQuery" :placeholder="searchPlaceholder" />
+                    <div class="flex flex-wrap items-center justify-between px-2 pb-2 text-sm border-b">
 
                         <data-list-filter-presets
+                            v-show="allowFilterPresets"
                             ref="presets"
-                            v-show="! showFilters"
                             :active-preset="activePreset"
                             :active-preset-payload="activePresetPayload"
                             :active-filters="activeFilters"
@@ -31,41 +29,33 @@
                             :search-query="searchQuery"
                             @selected="selectPreset"
                             @reset="filtersReset"
-                            @hide-filters="filtersHide"
-                            @show-filters="filtersShow"
                         />
-                        <div class="flex ml-2 space-x-2">
-                            <button class="btn py-1 px-2 h-8" v-text="__('Cancel')" v-show="showFilters" @click="filtersHide" />
-                            <button class="btn py-1 px-2 h-8" v-text="__('Save')" v-show="showFilters && isDirty" @click="$refs.presets.savePreset()" />
-                            <button class="btn flex items-center py-1 px-2 h-8" @click="handleShowFilters" v-if="! showFilters" v-tooltip="__('Show Filter Controls (F)')">
-                                <svg-icon name="light/search" class="w-4 h-4" />
-                                <svg-icon name="light/filter-lines" class="w-4 h-4" />
-                            </button>
+
+                        <data-list-search class="h-8 mt-2 min-w-[240px] w-full" ref="search" v-model="searchQuery" :placeholder="searchPlaceholder" />
+
+                        <div class="flex space-x-2 mt-2">
+                            <button class="btn btn-sm ml-2" v-text="__('Reset')" v-show="isDirty" @click="$refs.presets.refreshPreset()" />
+                            <button class="btn btn-sm ml-2" v-text="__('Save')" v-show="allowFilterPresets && isDirty" @click="$refs.presets.savePreset()" />
                             <data-list-column-picker :preferences-key="preferencesKey('columns')" />
                         </div>
                     </div>
 
-                   <div v-show="showFilters">
-                        <data-list-filters
-                            ref="filters"
-                            :filters="filters"
-                            :active-preset="activePreset"
-                            :active-preset-payload="activePresetPayload"
-                            :active-filters="activeFilters"
-                            :active-filter-badges="activeFilterBadges"
-                            :active-count="activeFilterCount"
-                            :search-query="searchQuery"
-                            :is-searching="showFilters"
-                            :saves-presets="true"
-                            :preferences-prefix="preferencesPrefix"
-                            @filter-changed="filterChanged"
-                            @search-changed="searchChanged"
-                            @saved="$refs.presets.setPreset($event)"
-                            @deleted="$refs.presets.refreshPresets()"
-                            @restore-preset="$refs.presets.viewPreset($event)"
-                            @reset="filtersReset"
-                        />
-                    </div>
+                    <data-list-filters
+                        ref="filters"
+                        :filters="filters"
+                        :active-preset="activePreset"
+                        :active-preset-payload="activePresetPayload"
+                        :active-filters="activeFilters"
+                        :active-filter-badges="activeFilterBadges"
+                        :active-count="activeFilterCount"
+                        :search-query="searchQuery"
+                        :is-searching="true"
+                        :saves-presets="true"
+                        :preferences-prefix="preferencesPrefix"
+                        @changed="filterChanged"
+                        @saved="$refs.presets.setPreset($event)"
+                        @deleted="$refs.presets.refreshPresets()"
+                    />
 
                     <div v-show="items.length === 0" class="p-6 text-center text-gray-500" v-text="__('No results')" />
 
@@ -140,6 +130,9 @@ export default {
     props: {
         listingKey: String,
         group: String,
+        allowFilterPresets: {
+            default: true,
+        },
     },
 
     data() {
diff --git a/resources/views/usergroups/show.blade.php b/resources/views/usergroups/show.blade.php
index 4b7a8d5b610..c0efed4f368 100644
--- a/resources/views/usergroups/show.blade.php
+++ b/resources/views/usergroups/show.blade.php
@@ -33,6 +33,7 @@
         listing-key="usergroup-users"
         group="{{ $group->id() }}"
         :filters="{{ $filters->toJson() }}"
+        :allow-filter-presets="false"
         action-url="{{ cp_route('users.actions.run') }}"
     ></user-listing>
 
diff --git a/src/Console/Commands/stubs/filter.php.stub b/src/Console/Commands/stubs/filter.php.stub
index 170767bfc3d..c8c669807fa 100644
--- a/src/Console/Commands/stubs/filter.php.stub
+++ b/src/Console/Commands/stubs/filter.php.stub
@@ -6,6 +6,13 @@ use Statamic\Query\Scopes\Filter;
 
 class DummyClass extends Filter
 {
+    /**
+     * Pin the filter.
+     *
+     * @var bool
+     */
+    public $pinned = false;
+
     /**
      * Define the filter's title.
      *
diff --git a/src/Http/Controllers/CP/Users/UserGroupsController.php b/src/Http/Controllers/CP/Users/UserGroupsController.php
index 50b6f40ef90..b2a1471213b 100644
--- a/src/Http/Controllers/CP/Users/UserGroupsController.php
+++ b/src/Http/Controllers/CP/Users/UserGroupsController.php
@@ -52,7 +52,9 @@ public function show($group)
 
         return view('statamic::usergroups.show', [
             'group' => $group,
-            'filters' => Scope::filters('usergroup-users'),
+            'filters' => Scope::filters('usergroup-users', [
+                'blueprints' => ['user'],
+            ]),
         ]);
     }
 
diff --git a/src/Http/Controllers/CP/Users/UsersController.php b/src/Http/Controllers/CP/Users/UsersController.php
index 7f4d7fc9f18..652acf66bde 100644
--- a/src/Http/Controllers/CP/Users/UsersController.php
+++ b/src/Http/Controllers/CP/Users/UsersController.php
@@ -45,19 +45,7 @@ protected function indexQuery()
         $query = User::query();
 
         if ($search = request('search')) {
-            if (Search::indexes()->has('users')) {
-                return Search::index('users')->ensureExists()->search($search);
-            }
-
-            $query
-                ->where('email', 'like', '%'.$search.'%')
-                ->when(User::blueprint()->hasField('first_name'), function ($query) use ($search) {
-                    $query
-                        ->orWhere('first_name', 'like', '%'.$search.'%')
-                        ->orWhere('last_name', 'like', '%'.$search.'%');
-                }, function ($query) use ($search) {
-                    $query->orWhere('name', 'like', '%'.$search.'%');
-                });
+            $query = $this->searchUsers($search, $query);
         }
 
         return $query;
@@ -67,7 +55,11 @@ protected function json($request)
     {
         $query = $request->group
             ? UserGroup::find($request->group)->queryUsers()
-            : $this->indexQuery();
+            : User::query();
+
+        if ($search = request('search')) {
+            $query = $this->searchUsers($search, $query, ! $request->has('group'));
+        }
 
         $activeFilterBadges = $this->queryFilters($query, $request->filters, [
             'blueprints' => ['user'],
@@ -85,6 +77,27 @@ protected function json($request)
             ]]);
     }
 
+    protected function searchUsers($search, $query, $useIndex = true)
+    {
+        if ($useIndex && Search::indexes()->has('users')) {
+            return Search::index('users')->ensureExists()->search($search);
+        }
+
+        $query->where(function ($query) use ($search) {
+            $query
+                ->where('email', 'like', '%'.$search.'%')
+                ->when(User::blueprint()->hasField('first_name'), function ($query) use ($search) {
+                    $query
+                        ->orWhere('first_name', 'like', '%'.$search.'%')
+                        ->orWhere('last_name', 'like', '%'.$search.'%');
+                }, function ($query) use ($search) {
+                    $query->orWhere('name', 'like', '%'.$search.'%');
+                });
+        });
+
+        return $query;
+    }
+
     /**
      * Create a new user.
      *
diff --git a/src/Http/View/Composers/JavascriptComposer.php b/src/Http/View/Composers/JavascriptComposer.php
index 97d29588ee8..e3e44f790c8 100644
--- a/src/Http/View/Composers/JavascriptComposer.php
+++ b/src/Http/View/Composers/JavascriptComposer.php
@@ -61,7 +61,6 @@ private function protectedVariables()
             'user' => $this->user($user),
             'paginationSize' => config('statamic.cp.pagination_size'),
             'paginationSizeOptions' => config('statamic.cp.pagination_size_options'),
-            'alwaysShowFilters' => config('statamic.cp.always_show_filters'),
             'sites' => $this->sites(),
             'selectedSite' => Site::selected()->handle(),
             'preloadableFieldtypes' => FieldtypeRepository::preloadable()->keys(),
diff --git a/src/Query/Scopes/Filter.php b/src/Query/Scopes/Filter.php
index 0d50d997918..4a3c685861d 100644
--- a/src/Query/Scopes/Filter.php
+++ b/src/Query/Scopes/Filter.php
@@ -11,6 +11,7 @@ abstract class Filter extends Scope implements Arrayable
     use HasTitle, HasFields;
 
     protected $context = [];
+    protected $pinned = false;
 
     public function visibleTo($key)
     {
@@ -58,6 +59,7 @@ public function toArray()
             'handle' => $this->handle(),
             'title' => $this->title(),
             'extra' => $this->extra(),
+            'pinned' => $this->pinned(),
             'auto_apply' => $this->autoApply(),
             'fields' => $this->fields()->toPublishArray(),
             'meta' => $this->fields()->meta(),
diff --git a/src/Query/Scopes/Filters/Blueprint.php b/src/Query/Scopes/Filters/Blueprint.php
index 112469ed2ba..c049530cfce 100644
--- a/src/Query/Scopes/Filters/Blueprint.php
+++ b/src/Query/Scopes/Filters/Blueprint.php
@@ -9,6 +9,8 @@
 
 class Blueprint extends Filter
 {
+    protected $pinned = true;
+
     public static function title()
     {
         return __('Blueprint');
diff --git a/src/Query/Scopes/Filters/Collection.php b/src/Query/Scopes/Filters/Collection.php
index 57f1bf154e1..ddfa4cf9b04 100644
--- a/src/Query/Scopes/Filters/Collection.php
+++ b/src/Query/Scopes/Filters/Collection.php
@@ -7,6 +7,8 @@
 
 class Collection extends Filter
 {
+    protected $pinned = true;
+
     public static function title()
     {
         return __('Collection');
diff --git a/src/Query/Scopes/Filters/Fields.php b/src/Query/Scopes/Filters/Fields.php
index 3de57154fcd..2ce25209e35 100644
--- a/src/Query/Scopes/Filters/Fields.php
+++ b/src/Query/Scopes/Filters/Fields.php
@@ -11,6 +11,8 @@
 
 class Fields extends Filter
 {
+    protected $pinned = true;
+
     public static function title()
     {
         return __('Field');
@@ -61,7 +63,7 @@ public function badge($values)
 
     public function visibleTo($key)
     {
-        return in_array($key, ['entries', 'entries-fieldtype', 'terms', 'users']);
+        return in_array($key, ['entries', 'entries-fieldtype', 'terms', 'users', 'usergroup-users']);
     }
 
     protected function getFields()
diff --git a/src/Query/Scopes/Filters/Site.php b/src/Query/Scopes/Filters/Site.php
index ceb3368517c..5e5ad092108 100644
--- a/src/Query/Scopes/Filters/Site.php
+++ b/src/Query/Scopes/Filters/Site.php
@@ -7,6 +7,8 @@
 
 class Site extends Filter
 {
+    protected $pinned = true;
+
     public static function title()
     {
         return __('Site');
diff --git a/src/Query/Scopes/Filters/Status.php b/src/Query/Scopes/Filters/Status.php
index ff0688d8ddb..d0ab3c540aa 100644
--- a/src/Query/Scopes/Filters/Status.php
+++ b/src/Query/Scopes/Filters/Status.php
@@ -7,6 +7,8 @@
 
 class Status extends Filter
 {
+    public $pinned = true;
+
     public static function title()
     {
         return __('Status');
diff --git a/src/Query/Scopes/Filters/UserGroup.php b/src/Query/Scopes/Filters/UserGroup.php
index 360b34c1d1d..022d96b2fe7 100644
--- a/src/Query/Scopes/Filters/UserGroup.php
+++ b/src/Query/Scopes/Filters/UserGroup.php
@@ -7,6 +7,8 @@
 
 class UserGroup extends Filter
 {
+    protected $pinned = true;
+
     public static function title()
     {
         return __('Group');
diff --git a/src/Query/Scopes/Filters/UserRole.php b/src/Query/Scopes/Filters/UserRole.php
index 71a3a77a490..18e4e8aea80 100644
--- a/src/Query/Scopes/Filters/UserRole.php
+++ b/src/Query/Scopes/Filters/UserRole.php
@@ -7,6 +7,8 @@
 
 class UserRole extends Filter
 {
+    protected $pinned = true;
+
     public static function title()
     {
         return __('Role');
diff --git a/src/Query/Scopes/ScopeRepository.php b/src/Query/Scopes/ScopeRepository.php
index 66af616709b..2887caa2f95 100644
--- a/src/Query/Scopes/ScopeRepository.php
+++ b/src/Query/Scopes/ScopeRepository.php
@@ -6,9 +6,10 @@ class ScopeRepository
 {
     public function all()
     {
-        return app('statamic.scopes')->map(function ($class) {
-            return app($class);
-        })->values();
+        return app('statamic.scopes')
+            ->map(fn ($class) => app($class))
+            ->filter()
+            ->values();
     }
 
     public function find($key, $context = [])
@@ -21,9 +22,7 @@ public function find($key, $context = [])
     public function filters($key, $context = [])
     {
         return $this->all()
-            ->filter(function ($filter) {
-                return $filter instanceof Filter;
-            })
+            ->filter(fn ($filter) => $filter instanceof Filter)
             ->each->context($context)
             ->filter->visibleTo($key)
             ->values();