diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/components/entity-property/entity-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/entity-property/entity-property.element.ts
index d244e20e26..bfd49745da 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/components/entity-property/entity-property.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/components/entity-property/entity-property.element.ts
@@ -8,7 +8,7 @@ import { createExtensionElement, UmbExtensionRegistry } from '../../../core/exte
 import type { ManifestPropertyEditorUI } from '../../../core/models';
 
 import '../../property-actions/shared/property-action-menu/property-action-menu.element';
-import '../editor-property-layout.element';
+import '../../editors/shared/editor-property-layout/editor-property-layout.element';
 
 @customElement('umb-entity-property')
 export class UmbEntityPropertyElement extends UmbContextConsumerMixin(LitElement) {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/components/editor-property-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-property-layout/editor-property-layout.element.ts
similarity index 66%
rename from src/Umbraco.Web.UI.Client/src/backoffice/components/editor-property-layout.element.ts
rename to src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-property-layout/editor-property-layout.element.ts
index c814c7ba03..83e8bd4a27 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/components/editor-property-layout.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-property-layout/editor-property-layout.element.ts
@@ -3,7 +3,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement } from 'lit/decorators.js';
 
 @customElement('umb-editor-property-layout')
-class UmbEditorPropertyLayout extends LitElement {
+export class UmbEditorPropertyLayoutElement extends LitElement {
 	static styles = [
 		UUITextStyles,
 		css`
@@ -17,14 +17,14 @@ class UmbEditorPropertyLayout extends LitElement {
 
 	render() {
 		return html`
-			<slot name="header" class="header"> </slot>
-			<slot name="editor" class="editor"> </slot>
+			<slot name="header" class="header"></slot>
+			<slot name="editor" class="editor"></slot>
 		`;
 	}
 }
 
 declare global {
 	interface HTMLElementTagNameMap {
-		'umb-editor-property-layout': UmbEditorPropertyLayout;
+		'umb-editor-property-layout': UmbEditorPropertyLayoutElement;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-property-layout/editor-property-layout.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-property-layout/editor-property-layout.stories.ts
new file mode 100644
index 0000000000..16d00973bb
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-property-layout/editor-property-layout.stories.ts
@@ -0,0 +1,17 @@
+import { Meta, Story } from '@storybook/web-components';
+import { html } from 'lit-html';
+
+import type { UmbEditorPropertyLayoutElement } from './editor-property-layout.element';
+import './editor-property-layout.element';
+
+export default {
+	title: 'Editors/Shared/Editor Property Layout',
+	component: 'umb-editor-property-layout',
+	id: 'umb-editor-property-layout',
+} as Meta;
+
+export const AAAOverview: Story<UmbEditorPropertyLayoutElement> = () => html` <umb-editor-property-layout>
+	<div slot="header"><uui-button color="" look="placeholder">Header</uui-button></div>
+	<div slot="editor"><uui-button color="" look="placeholder">Editor</uui-button></div>
+</umb-editor-property-layout>`;
+AAAOverview.storyName = 'Overview';