diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-type-configuration/property-editor-ui-block-grid-type-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-type-configuration/property-editor-ui-block-grid-type-configuration.element.ts
index c5b918799c..cae3b17d09 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-type-configuration/property-editor-ui-block-grid-type-configuration.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-type-configuration/property-editor-ui-block-grid-type-configuration.element.ts
@@ -1,12 +1,12 @@
 import type { UmbBlockTypeWithGroupKey, UmbInputBlockTypeElement } from '../../../block-type/index.js';
 import '../../../block-type/components/input-block-type/index.js';
 import { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry';
-import { html, customElement, property, state, css } from '@umbraco-cms/backoffice/external/lit';
+import { html, customElement, property, state, css, repeat } from '@umbraco-cms/backoffice/external/lit';
 import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { UMB_PROPERTY_DATASET_CONTEXT, UmbPropertyDatasetContext } from '@umbraco-cms/backoffice/property';
-import { BlockGridGroupConfigration } from '@umbraco-cms/backoffice/block';
+import { UmbBlockGridGroupType, UmbBlockGridGroupTypeConfiguration } from '@umbraco-cms/backoffice/block';
 
 /**
  * @element umb-property-editor-ui-block-grid-type-configuration
@@ -16,7 +16,7 @@ export class UmbPropertyEditorUIBlockGridTypeConfigurationElement
 	extends UmbLitElement
 	implements UmbPropertyEditorUiElement
 {
-	#context?: UmbPropertyDatasetContext;
+	#datasetContext?: UmbPropertyDatasetContext;
 
 	@property({ attribute: false })
 	value: UmbBlockTypeWithGroupKey[] = [];
@@ -25,34 +25,75 @@ export class UmbPropertyEditorUIBlockGridTypeConfigurationElement
 	public config?: UmbPropertyEditorConfigCollection;
 
 	@state()
-	private _blockGroups: Array<BlockGridGroupConfigration> = [];
+	private _blockGroups: Array<UmbBlockGridGroupType> = [];
 
-	//	@state()
-	//	private _groups: Array<{ name: string; key: string | null; blocks: UmbBlockTypeWithGroupKey[] }> = [];
+	@state()
+	private _mappedValuesAndGroups: Array<UmbBlockGridGroupTypeConfiguration> = [];
 
 	constructor() {
 		super();
 		this.consumeContext(UMB_PROPERTY_DATASET_CONTEXT, async (instance) => {
-			this.#context = instance;
+			this.#datasetContext = instance;
 			this.#observeProperties();
 		});
 	}
 
 	async #observeProperties() {
-		if (!this.#context) return;
+		if (!this.#datasetContext) return;
 
-		this.observe(await this.#context.propertyValueByAlias('blockGroups'), (value) => {
-			this._blockGroups = value as Array<BlockGridGroupConfigration>;
+		this.observe(await this.#datasetContext.propertyValueByAlias('blockGroups'), (value) => {
+			this._blockGroups = value as Array<UmbBlockGridGroupType>;
+			this.#mapValuesToBlockGroups();
+			console.log('groups changed', value);
+		});
+		this.observe(await this.#datasetContext.propertyValueByAlias('blocks'), (value) => {
+			this.#mapValuesToBlockGroups();
+			console.log('value changed', value);
 		});
 	}
 
+	#mapValuesToBlockGroups() {
+		const valuesWithNoGroup = this.value.filter(
+			// Look for values without a group, or with a group that is non existent.
+			(value) => !value.groupKey || this._blockGroups.find((group) => group.key !== value.groupKey),
+		);
+
+		const valuesWithGroup = this._blockGroups.map((group) => {
+			return { name: group.name, key: group.key, blocks: this.value.filter((value) => value.groupKey === group.key) };
+		});
+
+		this._mappedValuesAndGroups = [{ blocks: valuesWithNoGroup }, ...valuesWithGroup];
+	}
+
+	#onChange(e: Event, groupKey?: string) {
+		const newValue = (e.target as UmbInputBlockTypeElement).value;
+		const values = this.value.filter((item) => item.groupKey !== groupKey);
+		this.value = [...values, ...newValue];
+		this.dispatchEvent(new CustomEvent('property-value-change'));
+	}
+
+	render() {
+		return html`${repeat(
+			this._mappedValuesAndGroups,
+			(group) => group.key,
+			(group) =>
+				html`<umb-input-block-type
+					entity-type="block-grid-type"
+					.groupKey=${group.key}
+					.groupName=${group.name}
+					.value=${group.blocks}
+					@change=${(e: Event) => this.#onChange(e, group.key)}></umb-input-block-type>`,
+		)}`;
+	}
+
+	/*
 	render() {
 		return html`<umb-input-block-type
 			entity-type="block-grid-type"
 			.groups=${this._blockGroups}
 			.value=${this.value}
 			@change=${(e: Event) => (this.value = (e.target as UmbInputBlockTypeElement).value)}></umb-input-block-type>`;
-	}
+	}*/
 
 	static styles = [
 		UmbTextStyles,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/types.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/types.ts
index f8dfc9f5f2..b6c2e2a02e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/types.ts
@@ -1,4 +1,4 @@
-import type { UmbBlockTypeBase } from '../block-type/index.js';
+import type { UmbBlockTypeBase, UmbBlockTypeWithGroupKey } from '../block-type/index.js';
 
 export interface UmbBlockGridType extends UmbBlockTypeBase {
 	columnSpanOptions: Array<number>;
@@ -12,7 +12,11 @@ export interface UmbBlockGridType extends UmbBlockTypeBase {
 	groupKey: null | string;
 }
 
-export interface BlockGridGroupConfigration {
-	name?: string;
+export interface UmbBlockGridGroupType {
+	name: string;
 	key: string;
 }
+
+export interface UmbBlockGridGroupTypeConfiguration extends Partial<UmbBlockGridGroupType> {
+	blocks: Array<UmbBlockTypeWithGroupKey>;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/input-block-type/input-block-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/input-block-type/input-block-type.element.ts
index 6faacfd6d4..b8ec0604e8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/input-block-type/input-block-type.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/input-block-type/input-block-type.element.ts
@@ -9,24 +9,28 @@ import '../block-type-card/index.js';
 import { css, html, customElement, property, state, repeat } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
-import { BlockGridGroupConfigration } from '@umbraco-cms/backoffice/block';
 import { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
 import { UMB_PROPERTY_DATASET_CONTEXT, UmbPropertyDatasetContext } from '@umbraco-cms/backoffice/property';
+import { UmbBlockGridType } from '@umbraco-cms/backoffice/block';
 
 @customElement('umb-input-block-type')
 export class UmbInputBlockTypeElement<
 	BlockType extends UmbBlockTypeWithGroupKey = UmbBlockTypeBase,
 > extends UmbLitElement {
-	//
 	@property({ type: Array, attribute: false })
 	public get value() {
 		return this._items;
 	}
 	public set value(items) {
 		this._items = items ?? [];
-		this.#mapValues();
 	}
 
+	@property()
+	groupKey?: string;
+
+	@property()
+	groupName?: string;
+
 	@property({ type: String, attribute: 'entity-type' })
 	public get entityType() {
 		return this.#entityType;
@@ -51,35 +55,9 @@ export class UmbInputBlockTypeElement<
 	}
 	#entityType?: string;
 
-	#groups: Array<BlockGridGroupConfigration> = [];
-	@property({ type: Array })
-	public get groups(): Array<BlockGridGroupConfigration> {
-		return this.#groups;
-	}
-	public set groups(groups: Array<BlockGridGroupConfigration>) {
-		this.#groups = groups ?? [];
-		this.#mapValues();
-	}
-
-	#mapValues() {
-		const valuesWithNoGroup = this.value.filter(
-			// Look for values without a group, or with a group that is non existent.
-			(value) => !value.groupKey || this.#groups.find((group) => group.key !== value.groupKey),
-		);
-
-		const valuesWithGroup = this.#groups.map((group) => {
-			return { name: group.name, key: group.key, blocks: this.value.filter((value) => value.groupKey === group.key) };
-		});
-
-		this._mappedGroups = [{ key: '', name: '', blocks: valuesWithNoGroup }, ...valuesWithGroup];
-	}
-
 	@state()
 	private _items: Array<BlockType> = [];
 
-	@state()
-	private _mappedGroups: Array<BlockGridGroupConfigration & { blocks: Array<BlockType> }> = [];
-
 	@state()
 	private _workspacePath?: string;
 
@@ -89,11 +67,19 @@ export class UmbInputBlockTypeElement<
 	>;
 
 	#datasetContext?: UmbPropertyDatasetContext;
+	#blockGroups: Array<UmbBlockTypeGroup> = [];
+	#filter?: any;
 
 	constructor() {
 		super();
 		this.consumeContext(UMB_PROPERTY_DATASET_CONTEXT, async (instance) => {
 			this.#datasetContext = instance;
+			this.observe(await this.#datasetContext?.propertyValueByAlias('blockGroups'), (value) => {
+				this.#blockGroups = value as Array<UmbBlockTypeGroup>;
+			});
+			this.observe(await this.#datasetContext?.propertyValueByAlias('blocks'), (value) => {
+				this.#filter = value as Array<UmbBlockGridType>;
+			});
 		});
 	}
 
@@ -109,7 +95,7 @@ export class UmbInputBlockTypeElement<
 							// Only pick elements:
 							docType.isElement &&
 							// Prevent picking the an already used element type:
-							this._items.find((x) => x.contentElementTypeKey === docType.id) === undefined,
+							this.#filter.find((x: UmbBlockGridType) => x.contentElementTypeKey === docType.id) === undefined,
 					},
 				});
 
@@ -133,54 +119,41 @@ export class UmbInputBlockTypeElement<
 		return undefined;
 	}
 
-	#renameGroup(e: UUIInputEvent, key: string) {
-		if (!key) return;
-		const groupName = e.target.value as string;
-		const groups = this.groups.map((group) => (group.key === key ? { ...group, name: groupName } : group));
-
-		this.#datasetContext?.setPropertyValue('blockGroups', groups);
+	render() {
+		return html`${this.#renderGroupInput()}
+			<div>
+				${repeat(this.value, (block) => block.contentElementTypeKey, this.#renderItem)} ${this.#renderButton()}
+			</div>`;
 	}
 
-	#deleteGroup(key: string) {
+	#renderGroupInput() {
+		if (!this.groupKey) return;
+		return html`<uui-input auto-width label="Group" .value=${this.groupName} @change=${this.#changeGroupName}>
+			<uui-button compact slot="append" label="delete" @click=${this.#deleteGroup}>
+				<uui-icon name="icon-trash"></uui-icon>
+			</uui-button>
+		</uui-input>`;
+	}
+
+	#changeGroupName(e: UUIInputEvent) {
+		if (!this.groupKey) return;
+
+		const groupName = e.target.value as string;
 		this.#datasetContext?.setPropertyValue(
 			'blockGroups',
-			this.groups.filter((group) => group.key !== key),
+			this.#blockGroups.map((group) => ({ ...group, groupName: this.groupKey === group.key ? groupName : group.name })),
 		);
-		this.value = this.value.filter((block) => block.groupKey !== key);
-		this.dispatchEvent(new UmbChangeEvent());
-		this.#mapValues();
 	}
 
-	render() {
-		return html`${repeat(
-			this._mappedGroups,
-			(group) => group.key,
-			(group) =>
-				html` ${group.key
-						? html`<uui-input
-								auto-width
-								.value=${group.name}
-								label="Group"
-								@change=${(e: UUIInputEvent) => this.#renameGroup(e, group.key)}>
-								<uui-button compact slot="append" label="delete" @click=${() => this.#deleteGroup(group.key)}>
-									<uui-icon name="icon-trash"></uui-icon>
-								</uui-button>
-						  </uui-input>`
-						: ''}
-					<div>
-						${repeat(
-							group.blocks,
-							(block) => block.contentElementTypeKey,
-							(block) =>
-								html`<umb-block-type-card
-									.workspacePath=${this._workspacePath}
-									.key=${block.contentElementTypeKey}
-									@delete=${() => this.deleteItem(block.contentElementTypeKey)}>
-								</umb-block-type-card>`,
-						)}
-						${this.#renderButton()}
-					</div>`,
-		)}`;
+	#deleteGroup() {
+		if (!this.groupKey) return;
+		this.#datasetContext?.setPropertyValue(
+			'blockGroups',
+			this.#blockGroups.filter((group) => group.key !== this.groupKey),
+		);
+		this.value = this._items.filter((block) => block.groupKey !== this.groupKey);
+		this.dispatchEvent(new UmbChangeEvent());
+		console.log(this.value);
 	}
 
 	#renderButton() {