diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 1cf6e6425..a5546c134 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -17,10 +17,11 @@
 
 import {CoreFilterAPIs} from './API.js';
 import {CoreRESTClient} from '../../RESTClient.js';
-import {CoreFetchCmpt} from '../../components/Fetch.js';
+import {CoreFetchCmpt} from '../Fetch.js';
 import FilterConfig from './Filter/Config.js';
 import FilterColumns from './Filter/Columns.js';
 import TableDownload from './Table/Download.js';
+import collapseAutoClose from '../../directives/collapseAutoClose.js';
 
 //
 const FILTER_COMPONENT_NEW_FILTER = 'Filter Component New Filter';
@@ -38,6 +39,9 @@ export const CoreFilterCmpt = {
 		FilterColumns,
 		TableDownload
 	},
+	directives: {
+		collapseAutoClose
+	},
 	emits: [
 		'nwNewEntry',
 		'click:new'
@@ -562,6 +566,7 @@ export const CoreFilterCmpt = {
 				:names="fieldNames"
 				@hide="tabulator.hideColumn($event)"
 				@show="tabulator.showColumn($event)"
+				v-collapse-auto-close
 			></filter-columns>
 
 			<filter-config
@@ -575,12 +580,14 @@ export const CoreFilterCmpt = {
 				@switch-filter="switchFilter"
 				@apply-filter-config="applyFilterConfig"
 				@save-custom-filter="handlerSaveCustomFilter"
+				v-collapse-auto-close
 			></filter-config>
 			<div
 				v-else-if="$slots.filter"
 				:id="'collapseFilters' + idExtra"
 				class="card-body collapse"
 				:data-bs-parent="'#filterCollapsables' + idExtra"
+				v-collapse-auto-close
 				>
 				<slot name="filter"></slot>
 			</div>
diff --git a/public/js/directives/collapseAutoClose.js b/public/js/directives/collapseAutoClose.js
new file mode 100644
index 000000000..953c3df9f
--- /dev/null
+++ b/public/js/directives/collapseAutoClose.js
@@ -0,0 +1,29 @@
+const elementDataMap = new WeakMap();
+
+export default {
+	mounted(el, binding) {
+		let open = false;
+		elementDataMap.set(el, evt => {
+			if (!open)
+				return;
+
+			if (el.contains(evt.target))
+				return;
+			
+			const collapse = bootstrap.Collapse.getInstance(el)
+			if (collapse)
+				collapse.hide();
+		});
+		el.addEventListener('shown.bs.collapse', () => {
+			open = true;
+		});
+		el.addEventListener('hide.bs.collapse', () => {
+			open = false;
+		});
+		window.addEventListener('click', elementDataMap.get(el));
+	},
+	beforeUnmount(el, binding) {
+		window.removeEventListener('click', elementDataMap.get(el));
+		delete el.collapsibleAutoHideFunc;
+	}
+}
\ No newline at end of file