diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-properties.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-properties.element.ts
index 1e81163a52..b4eca8bfe5 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-properties.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-properties.element.ts
@@ -35,7 +35,8 @@ export class UmbDocumentTypeWorkspaceViewEditPropertiesElement extends UmbLitEle
 				let sortOrder: number;
 
 				if (model.length > 1) {
-					sortOrder = modelIndex > 0 ? model[modelIndex - 1].sortOrder + 1 : model[modelIndex + 1].sortOrder - 1;
+					sortOrder =
+						modelIndex > 0 ? (model[modelIndex - 1].sortOrder ?? 0) + 1 : (model[modelIndex + 1].sortOrder ?? 0) - 1;
 				} else {
 					sortOrder = 0;
 				}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-tab.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-tab.element.ts
index a81589c5b0..8629e59e24 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-tab.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-tab.element.ts
@@ -17,26 +17,16 @@ export class UmbDocumentTypeWorkspaceViewEditTabElement extends UmbLitElement {
 		PropertyTypeContainerModelBaseModel,
 		UmbDocumentTypeWorkspaceViewEditPropertiesElement
 	>(this, {
-		getUniqueOfElement: (element) =>
-			element.querySelector('umb-document-type-workspace-view-edit-properties')?.containerId ?? '',
+		getUniqueOfElement: (element) => {
+			console.log('unique');
+			return element.querySelector('umb-document-type-workspace-view-edit-properties')?.containerId ?? '';
+		},
 		getUniqueOfModel: (modelEntry) => modelEntry.id,
 		identifier: 'document-type-container-sorter',
 		itemSelector: 'span',
-		containerSelector: '#container-list',
+		containerSelector: '.container-list',
 		onChange: ({ item, model }) => {
-			const modelIndex = model.findIndex((entry) => entry.id === item.id);
-			if (modelIndex === -1) return;
-			let sortOrder: number;
-
-			if (model.length > 1) {
-				sortOrder = modelIndex > 0 ? model[modelIndex - 1].sortOrder + 1 : model[modelIndex + 1].sortOrder - 1;
-			} else {
-				sortOrder = 0;
-			}
-
-			this._groupStructureHelper.partialUpdateContainer(item.id, {
-				sortOrder: sortOrder,
-			});
+			console.log(model, item);
 
 			this._groups = model;
 		},
@@ -129,6 +119,7 @@ export class UmbDocumentTypeWorkspaceViewEditTabElement extends UmbLitElement {
 
 	render() {
 		return html`
+			<div class="container-list"></div>
 			${!this._noTabName
 				? html`
 						<uui-box>
@@ -139,7 +130,7 @@ export class UmbDocumentTypeWorkspaceViewEditTabElement extends UmbLitElement {
 						</uui-box>
 				  `
 				: ''}
-			<div id="container-list">
+			<div class="container-list">
 				${repeat(
 					this._groups,
 					(group) => group.id ?? '' + group.name,
@@ -252,6 +243,11 @@ export class UmbDocumentTypeWorkspaceViewEditTabElement extends UmbLitElement {
 				border-radius: var(--uui-border-radius);
 				border: 1px dashed var(--uui-color-divider-emphasis);
 			}
+
+			.container-list {
+				min-height: 50px;
+				border: 1px solid red;
+			}
 		`,
 	];
 }