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
new file mode 100644
index 0000000000..70380db2f0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-filter.element.ts
@@ -0,0 +1,131 @@
+import { UUITextStyles } from '@umbraco-ui/uui-css';
+import { css, html } from 'lit';
+import { customElement, property, query, state } from 'lit/decorators.js';
+import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
+import {
+	OperatorModel,
+	TemplateQueryExecuteFilterPresentationModel,
+	TemplateQueryPropertyTypeModel,
+	TemplateQuerySettingsResponseModel,
+} from '@umbraco-cms/backoffice/backend-api';
+import { UUIComboboxListElement } from '@umbraco-ui/uui';
+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>{};
+
+	@property({ type: Object, attribute: false })
+	settings: TemplateQuerySettingsResponseModel | null = null;
+
+	@state()
+	currentPropertyType: TemplateQueryPropertyTypeModel | null = null;
+
+	#setPropertyAlias = (e: Event) => {
+		const target = e.target as UUIComboboxListElement;
+		const oldCurrentPropertyType = this.currentPropertyType;
+		this.filter = { ...this.filter, propertyAlias: target.value as string };
+		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) => {
+		const target = e.target as UUIComboboxListElement;
+		this.filter = { ...this.filter, constraintValue: target.value as string };
+	};
+
+	#setOperator = (e: Event) => {
+		const target = e.target as UUIComboboxListElement;
+		this.filter = { ...this.filter, operator: target.value as OperatorModel };
+		this._operatorDropdown?.closePopover();
+	};
+
+	#resetOperator() {
+		this.filter = { ...this.filter, operator: undefined };
+	}
+
+	private _renderOperatorsDropdown() {
+		return html`<umb-button-with-dropdown look="outline" id="operator-dropdown">
+			${this.filter?.operator ?? ''}
+			<uui-combobox-list slot="dropdown" @change=${this.#setOperator} class="options-list">
+				${this.settings?.operators
+					?.filter((operator) =>
+						this.currentPropertyType ? operator.applicableTypes?.includes(this.currentPropertyType) : true
+					)
+					.map(
+						(operator) =>
+							html`<uui-combobox-list-option .value=${(operator.operator as string) ?? ''}
+								>${operator.operator}</uui-combobox-list-option
+							>`
+					)}</uui-combobox-list
+			>
+		</umb-button-with-dropdown>`;
+	}
+
+	private _renderConstraintValueInput() {
+		switch (this.currentPropertyType) {
+			case TemplateQueryPropertyTypeModel.INTEGER:
+				return html`<uui-input type="number" @change=${this.#setConstrainValue}></uui-input>`;
+			case TemplateQueryPropertyTypeModel.STRING:
+				return html`<uui-input type="text" @change=${this.#setConstrainValue}></uui-input>`;
+			case TemplateQueryPropertyTypeModel.DATE_TIME:
+				return html`<uui-input type="datetime-local" @change=${this.#setConstrainValue}></uui-input>`;
+			default:
+				return html`<input type="text" @change=${this.#setConstrainValue} />`;
+		}
+	}
+
+	render() {
+		return html`where
+			<umb-button-with-dropdown look="outline" id="property-alias-dropdown"
+				>${this.filter?.propertyAlias ?? ''}
+				<uui-combobox-list slot="dropdown" @change=${this.#setPropertyAlias} class="options-list">
+					${this.settings?.properties?.map(
+						(property) =>
+							html`<uui-combobox-list-option .value=${property.alias ?? ''}
+								>${property.alias}</uui-combobox-list-option
+							>`
+					)}
+				</uui-combobox-list></umb-button-with-dropdown
+			>
+			${this.filter?.propertyAlias ? this._renderOperatorsDropdown() : ''}
+			${this.filter?.operator ? this._renderConstraintValueInput() : ''} `;
+	}
+
+	static styles = [
+		UUITextStyles,
+		css`
+			:host {
+				display: flex;
+				align-items: center;
+			}
+
+			.options-list {
+				min-width: 25ch;
+				background-color: var(--uui-color-surface);
+				box-shadow: var(--uui-shadow-depth-3);
+			}
+
+			uui-combobox-list-option {
+				padding: 8px 20px;
+			}
+		`,
+	];
+}
+
+export default UmbQueryBuilderFilterElement;
+
+declare global {
+	interface HTMLElementTagNameMap {
+		'umb-query-builder-filter': UmbQueryBuilderFilterElement;
+	}
+}
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 d616abffef..2d83f6d137 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,6 +14,7 @@ import {
 } 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 {
 	hidePartialViews?: boolean;
@@ -86,7 +87,7 @@ export default class UmbChooseInsertTypeModalElement extends UmbModalBaseElement
 		const { data, error } = await this.#templateRepository.postTemplateQueryExecute({
 			requestBody: this._queryRequest,
 		});
-		console.log(this._queryRequest)
+		console.log(this._queryRequest);
 		if (data) this._templateQuery = { ...data };
 	}
 
@@ -147,10 +148,7 @@ export default class UmbChooseInsertTypeModalElement extends UmbModalBaseElement
 								>${this._selectedRootContentName}
 							</uui-button>
 						</div>
-						<div class="row">
-							where <uui-button look="outline">(allowed properties)</uui-button>
-							<uui-button look="outline">(filtered conditions)</uui-button>
-						</div>
+						<umb-query-builder-filter class="row" .settings=${this._queryBuilderSettings}></umb-query-builder-filter>
 						<div class="row">
 							ordered by <uui-button look="outline">(allowed properties)</uui-button>
 							<uui-button look="outline">ascending/descending</uui-button>