diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-filter.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-filter.element.ts
index 257a678578..90fbb0de92 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-filter.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-filter.element.ts
@@ -15,16 +15,9 @@ import {
 	TemplateQueryPropertyTypeModel,
 	TemplateQuerySettingsResponseModel,
 } from '@umbraco-cms/backoffice/backend-api';
-import { UmbButtonWithDropdownElement } from '@umbraco-cms/backoffice/components';
 
 @customElement('umb-query-builder-filter')
 export class UmbQueryBuilderFilterElement extends UmbLitElement {
-	@query('#property-alias-dropdown')
-	private _propertyAliasDropdown?: UmbButtonWithDropdownElement;
-
-	@query('#operator-dropdown')
-	private _operatorDropdown?: UmbButtonWithDropdownElement;
-
 	@property({ type: Object, attribute: false })
 	filter: TemplateQueryExecuteFilterPresentationModel = <TemplateQueryExecuteFilterPresentationModel>{};
 
@@ -44,7 +37,6 @@ export class UmbQueryBuilderFilterElement extends UmbLitElement {
 		this.currentPropertyType =
 			this.settings?.properties?.find((p) => p.alias === this.filter.propertyAlias)?.type ?? null;
 		if (oldCurrentPropertyType !== this.currentPropertyType) this.#resetOperator();
-		this._propertyAliasDropdown?.closePopover();
 	};
 
 	#setConstrainValue = (e: Event) => {
@@ -55,7 +47,6 @@ export class UmbQueryBuilderFilterElement extends UmbLitElement {
 	#setOperator = (e: Event) => {
 		const target = e.target as UUIComboboxListElement;
 		this.filter = { ...this.filter, operator: target.value as OperatorModel };
-		this._operatorDropdown?.closePopover();
 	};
 
 	#resetOperator() {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder.element.ts
index c34efd429d..352446fc45 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder.element.ts
@@ -14,7 +14,6 @@ import {
 	TemplateQuerySettingsResponseModel,
 } from '@umbraco-cms/backoffice/backend-api';
 import { UmbDocumentRepository } from '@umbraco-cms/backoffice/document';
-import { UmbButtonWithDropdownElement } from '@umbraco-cms/backoffice/components';
 import './query-builder-filter.element.js';
 
 export interface TemplateQueryBuilderModalData {
@@ -35,12 +34,6 @@ export default class UmbChooseInsertTypeModalElement extends UmbModalBaseElement
 	TemplateQueryBuilderModalData,
 	UmbTemplateQueryBuilderModalValue
 > {
-	@query('#content-type-dropdown')
-	private _contentTypeDropdown?: UmbButtonWithDropdownElement;
-
-	@query('#sort-dropdown')
-	private _sortDropdown?: UmbButtonWithDropdownElement;
-
 	@query('#filter-container')
 	private _filterContainer?: HTMLElement;
 
@@ -148,7 +141,6 @@ export default class UmbChooseInsertTypeModalElement extends UmbModalBaseElement
 	#setContentType(event: Event) {
 		const target = event.target as UUIComboboxListElement;
 		this.#updateQueryRequest({ contentTypeAlias: (target.value as string) ?? '' });
-		this._contentTypeDropdown!.closePopover();
 	}
 
 	#setSortProperty(event: Event) {
@@ -159,7 +151,6 @@ export default class UmbChooseInsertTypeModalElement extends UmbModalBaseElement
 		this.#updateQueryRequest({
 			sort: { ...this._queryRequest.sort, propertyAlias: (target.value as string) ?? '' },
 		});
-		this._sortDropdown!.closePopover();
 	}
 
 	#setSortDirection() {