diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-type-settings/property-type-settings-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-type-settings/property-type-settings-modal.element.ts
index 30604a05f6..8c045ef7a7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-type-settings/property-type-settings-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-type-settings/property-type-settings-modal.element.ts
@@ -227,12 +227,12 @@ export class UmbPropertyTypeSettingsModalElement extends UmbModalBaseElement<
 									<!-- TODO: Align styling across this and the property of document type workspace editor, or consider if this can go away for a different UX flow -->
 									<uui-input
 										id="name-input"
-										${umbFocus()}
 										name="name"
 										label="property name (TODO: Localize)"
 										@input=${this.#onNameChange}
 										.value=${this.value.name}
-										placeholder="Enter a name...">
+										placeholder="Enter a name..."
+										${umbFocus()}>
 										<!-- TODO: validation for bad characters -->
 									</uui-input>
 									<uui-input
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/icon-picker/icon-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/icon-picker/icon-picker-modal.element.ts
index 91fbb6af8e..6d454f5156 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/icon-picker/icon-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/icon-picker/icon-picker-modal.element.ts
@@ -7,6 +7,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import type { UmbIconPickerModalData, UmbIconPickerModalValue } from '@umbraco-cms/backoffice/modal';
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 import { extractUmbColorVariable, umbracoColors } from '@umbraco-cms/backoffice/resources';
+import { umbFocus } from '@umbraco-cms/backoffice/lit-element';
 
 // TODO: Make use of UmbPickerLayoutBase
 // TODO: to prevent element extension we need to move the Picker logic into a separate class we can reuse across all pickers
@@ -109,7 +110,8 @@ export class UmbIconPickerModalElement extends UmbModalBaseElement<UmbIconPicker
 			placeholder=${this.localize.term('placeholders_filter')}
 			label=${this.localize.term('placeholders_filter')}
 			id="searchbar"
-			@keyup="${this.#filterIcons}">
+			@keyup="${this.#filterIcons}"
+			${umbFocus()}>
 			<uui-icon name="search" slot="prepend" id="searchbar_icon"></uui-icon>
 		</uui-input>`;
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/item-picker/item-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/item-picker/item-picker-modal.element.ts
index 579ec7bec7..2903c9be24 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/item-picker/item-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/item-picker/item-picker-modal.element.ts
@@ -11,6 +11,7 @@ import {
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import type { UmbItemPickerModalData, UmbItemPickerModel } from '@umbraco-cms/backoffice/modal';
+import { umbFocus } from '@umbraco-cms/backoffice/lit-element';
 
 @customElement('umb-item-picker-modal')
 export class UmbItemPickerModalElement extends UmbModalBaseElement<UmbItemPickerModalData, UmbItemPickerModel> {
@@ -52,7 +53,11 @@ export class UmbItemPickerModalElement extends UmbModalBaseElement<UmbItemPicker
 		return html`
 			<umb-body-layout headline=${this.data.headline}>
 				<div id="main">
-					<uui-input type="search" placeholder=${this.localize.term('placeholders_filter')} @input=${this.#filter}>
+					<uui-input
+						type="search"
+						placeholder=${this.localize.term('placeholders_filter')}
+						@input=${this.#filter}
+						${umbFocus()}>
 						<div slot="prepend">
 							<uui-icon name="search"></uui-icon>
 						</div>
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts
index 6342015531..833b115891 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts
@@ -7,7 +7,7 @@ import {
 } from '@umbraco-cms/backoffice/external/uui';
 import { css, html, nothing, customElement, state, query } from '@umbraco-cms/backoffice/external/lit';
 import { UMB_WORKSPACE_SPLIT_VIEW_CONTEXT, type ActiveVariant } from '@umbraco-cms/backoffice/workspace';
-import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { UmbLitElement, umbFocus } from '@umbraco-cms/backoffice/lit-element';
 import { DocumentVariantStateModel } from '@umbraco-cms/backoffice/external/backend-api';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import type { UmbDocumentWorkspaceContext } from '@umbraco-cms/backoffice/document';
@@ -206,6 +206,7 @@ export class UmbVariantSelectorElement extends UmbLitElement {
 				label="Document name (TODO: Localize)"
 				.value=${this._name ?? ''}
 				@input=${this.#handleInput}
+				${umbFocus()}
 			>
 				${
 					this._variants?.length
diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts
index d0d634e4e0..962abe0c73 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts
@@ -14,6 +14,7 @@ import type { ManifestPropertyEditorUi } from '@umbraco-cms/backoffice/extension
 import type { UmbDataTypeItemModel } from '@umbraco-cms/backoffice/data-type';
 import type { UmbModalRouteBuilder } from '@umbraco-cms/backoffice/modal';
 import type { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
+import { umbFocus } from '@umbraco-cms/backoffice/lit-element';
 
 interface GroupedItems<T> {
 	[key: string]: Array<T>;
@@ -187,7 +188,8 @@ export class UmbDataTypePickerFlowModalElement extends UmbModalBaseElement<
 			id="filter"
 			@input="${this._handleFilterInput}"
 			placeholder="Type to filter..."
-			label="Type to filter icons">
+			label="Type to filter icons"
+			${umbFocus()}>
 			<uui-icon name="search" slot="prepend" id="filter-icon"></uui-icon>
 		</uui-input>`;
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
index 938329aea6..7a1894f23f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
@@ -8,6 +8,7 @@ import type {
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 import type { ManifestPropertyEditorUi } from '@umbraco-cms/backoffice/extension-registry';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
+import { umbFocus } from '@umbraco-cms/backoffice/lit-element';
 
 interface GroupedPropertyEditorUIs {
 	[key: string]: Array<ManifestPropertyEditorUi>;
@@ -71,7 +72,7 @@ export class UmbPropertyEditorUIPickerModalElement extends UmbModalBaseElement<
 					return (
 						propertyEditorUI.name.toLowerCase().includes(query) || propertyEditorUI.alias.toLowerCase().includes(query)
 					);
-			  });
+				});
 
 		// TODO: groupBy is not known by TS yet
 		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -104,7 +105,8 @@ export class UmbPropertyEditorUIPickerModalElement extends UmbModalBaseElement<
 			id="filter"
 			@input="${this.#handleFilterInput}"
 			placeholder="Type to filter..."
-			label="Type to filter icons">
+			label="Type to filter icons"
+			${umbFocus()}>
 			<uui-icon name="search" slot="prepend" id="filter-icon"></uui-icon>
 		</uui-input>`;
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace-editor.element.ts
index 45467a2189..db4e305eaa 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace-editor.element.ts
@@ -2,7 +2,7 @@ import { UMB_DATA_TYPE_WORKSPACE_CONTEXT } from './data-type-workspace.context-t
 import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui';
 import { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
 import { css, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
-import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { UmbLitElement, umbFocus } from '@umbraco-cms/backoffice/lit-element';
 import type { ManifestWorkspace } from '@umbraco-cms/backoffice/extension-registry';
 /**
  * @element umb-data-type-workspace-editor
@@ -24,29 +24,10 @@ export class UmbDataTypeWorkspaceEditorElement extends UmbLitElement {
 		this.consumeContext(UMB_DATA_TYPE_WORKSPACE_CONTEXT, (workspaceContext) => {
 			this.#workspaceContext = workspaceContext;
 			this.#workspaceContext.createPropertyDatasetContext(this);
-			this.#observeIsNew();
 			this.#observeName();
 		});
 	}
 
-	// TODO: invent some general way for all workspaces, with a name?, to put focus on the name when new.
-	#observeIsNew() {
-		if (!this.#workspaceContext) return;
-		this.observe(
-			this.#workspaceContext.isNew,
-			(isNew) => {
-				if (isNew) {
-					// TODO: Make a general way to put focus on a input in a modal. (also make sure it only happens if its the top-most-modal.)
-					requestAnimationFrame(() => {
-						(this.shadowRoot!.querySelector('#nameInput') as HTMLElement).focus();
-					});
-				}
-				this.removeUmbControllerByAlias('isNewRedirectController');
-			},
-			'_observeIsNew',
-		);
-	}
-
 	#observeName() {
 		if (!this.#workspaceContext) return;
 		this.observe(this.#workspaceContext.name, (dataTypeName) => {
@@ -70,7 +51,12 @@ export class UmbDataTypeWorkspaceEditorElement extends UmbLitElement {
 	render() {
 		return html`
 			<umb-workspace-editor alias="Umb.Workspace.DataType">
-				<uui-input slot="header" id="nameInput" .value=${this._dataTypeName} @input="${this.#handleInput}"></uui-input>
+				<uui-input
+					slot="header"
+					id="nameInput"
+					.value=${this._dataTypeName}
+					@input="${this.#handleInput}"
+					${umbFocus()}></uui-input>
 			</umb-workspace-editor>
 		`;
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace-editor.element.ts
index b1a2e6eb04..96d7b1aa3d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace-editor.element.ts
@@ -2,7 +2,7 @@ import { UMB_DICTIONARY_WORKSPACE_CONTEXT } from './dictionary-workspace.context
 import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui';
 import { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
 import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
-import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { UmbLitElement, umbFocus } from '@umbraco-cms/backoffice/lit-element';
 
 @customElement('umb-dictionary-workspace-editor')
 export class UmbDictionaryWorkspaceEditorElement extends UmbLitElement {
@@ -47,7 +47,8 @@ export class UmbDictionaryWorkspaceEditorElement extends UmbLitElement {
 						placeholder=${this.localize.term('placeholders_entername')}
 						.value=${this._name ?? ''}
 						@input="${this.#handleInput}"
-						label="${this.localize.term('general_dictionary')} ${this.localize.term('general_name')}"></uui-input>
+						label="${this.localize.term('general_dictionary')} ${this.localize.term('general_name')}"
+						${umbFocus()}></uui-input>
 				</div>
 			</umb-workspace-editor>
 		`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts
index 2648fd0d73..fa5bc5f053 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts
@@ -3,7 +3,7 @@ import { UMB_LANGUAGE_WORKSPACE_CONTEXT } from './language-workspace.context-tok
 import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui';
 import { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
 import { css, html, customElement, state, ifDefined } from '@umbraco-cms/backoffice/external/lit';
-import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { UmbLitElement, umbFocus } from '@umbraco-cms/backoffice/lit-element';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 @customElement('umb-language-workspace-editor')
 export class UmbLanguageWorkspaceEditorElement extends UmbLitElement {
@@ -55,7 +55,8 @@ export class UmbLanguageWorkspaceEditorElement extends UmbLitElement {
 					: html`<uui-input
 							label="Language name"
 							value=${ifDefined(this._language?.name)}
-							@input="${this.#handleInput}"></uui-input>`}
+							@input="${this.#handleInput}"
+							${umbFocus()}></uui-input>`}
 			</div>
 		</umb-workspace-editor>`;
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace-editor.element.ts
index 4fee493db8..66c3009968 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace-editor.element.ts
@@ -3,7 +3,7 @@ import { UMB_MEDIA_TYPE_WORKSPACE_CONTEXT } from './media-type-workspace.context
 import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui';
 import { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
 import { css, html, customElement, state, ifDefined } from '@umbraco-cms/backoffice/external/lit';
-import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { UmbLitElement, umbFocus } from '@umbraco-cms/backoffice/lit-element';
 import { UMB_ICON_PICKER_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
 import { generateAlias } from '@umbraco-cms/backoffice/utils';
 
@@ -37,18 +37,6 @@ export class UmbMediaTypeWorkspaceEditorElement extends UmbLitElement {
 		this.observe(this.#workspaceContext.name, (name) => (this._name = name), '_observeName');
 		this.observe(this.#workspaceContext.alias, (alias) => (this._alias = alias), '_observeAlias');
 		this.observe(this.#workspaceContext.icon, (icon) => (this._icon = icon), '_observeIcon');
-
-		this.observe(
-			this.#workspaceContext.isNew,
-			(isNew) => {
-				if (isNew) {
-					// TODO: Would be good with a more general way to bring focus to the name input.
-					(this.shadowRoot?.querySelector('#name') as HTMLElement)?.focus();
-				}
-				this.removeUmbControllerByAlias('isNewRedirectController');
-			},
-			'_observeIsNew',
-		);
 	}
 
 	// TODO: find a way where we don't have to do this for all workspaces.
@@ -115,7 +103,7 @@ export class UmbMediaTypeWorkspaceEditorElement extends UmbLitElement {
 					<umb-icon name=${ifDefined(this._icon)}></umb-icon>
 				</uui-button>
 
-				<uui-input id="name" .value=${this._name} @input="${this.#onNameChange}" label="name">
+				<uui-input id="name" .value=${this._name} @input="${this.#onNameChange}" label="name" ${umbFocus()}>
 					<!-- TODO: should use UUI-LOCK-INPUT, but that does not fire an event when its locked/unlocked -->
 					<uui-input
 						name="alias"
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/workspace/member-group-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/workspace/member-group-workspace-editor.element.ts
index 65180d682c..a2f5f27ac4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/workspace/member-group-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/workspace/member-group-workspace-editor.element.ts
@@ -1,7 +1,7 @@
 import { UMB_MEMBER_GROUP_WORKSPACE_CONTEXT } from './member-group-workspace.context-token.js';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, customElement, property, state, nothing } from '@umbraco-cms/backoffice/external/lit';
-import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { UmbLitElement, umbFocus } from '@umbraco-cms/backoffice/lit-element';
 import type { ManifestWorkspace } from '@umbraco-cms/backoffice/extension-registry';
 import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui';
 import { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
@@ -62,7 +62,7 @@ export class UmbMemberGroupWorkspaceEditorElement extends UmbLitElement {
 				${this.#renderActions()}
 				<div id="header" slot="header">
 					${this.#renderBackButton()}
-					<uui-input id="nameInput" .value=${this._name} @input="${this.#onInput}"></uui-input>
+					<uui-input id="nameInput" .value=${this._name} @input="${this.#onInput}" ${umbFocus()}></uui-input>
 				</div>
 			</umb-workspace-editor>
 		`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/workspace/member-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/workspace/member-type-workspace-editor.element.ts
index 10cac1e6a0..37f3e59b7b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/workspace/member-type-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/workspace/member-type-workspace-editor.element.ts
@@ -1,6 +1,6 @@
 import { UMB_MEMBER_TYPE_WORKSPACE_CONTEXT } from './member-type-workspace.context-token.js';
 import { css, html, customElement, state, ifDefined } from '@umbraco-cms/backoffice/external/lit';
-import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { UmbLitElement, umbFocus } from '@umbraco-cms/backoffice/lit-element';
 import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui';
 import { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
 import { UMB_ICON_PICKER_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
@@ -118,7 +118,7 @@ export class UmbMemberTypeWorkspaceEditorElement extends UmbLitElement {
 						<uui-icon name="${ifDefined(this._icon)}" style="color: ${this._iconColorAlias}"></uui-icon>
 					</uui-button>
 
-					<uui-input id="name" .value=${this._name} @input="${this.#onNameChange}" label="name">
+					<uui-input id="name" .value=${this._name} @input="${this.#onNameChange}" label="name" ${umbFocus()}>
 						<!-- TODO: should use UUI-LOCK-INPUT, but that does not fire an event when its locked/unlocked -->
 						<uui-input
 							name="alias"
diff --git a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-searchers.ts b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-searchers.ts
index 05d8649b00..a37110ec08 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-searchers.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-searchers.ts
@@ -3,7 +3,7 @@ import { css, html, nothing, customElement, state, query, property } from '@umbr
 import { UMB_MODAL_MANAGER_CONTEXT, UMB_EXAMINE_FIELDS_SETTINGS_MODAL } from '@umbraco-cms/backoffice/modal';
 import type { SearchResultResponseModel, FieldPresentationModel } from '@umbraco-cms/backoffice/external/backend-api';
 import { SearcherService } from '@umbraco-cms/backoffice/external/backend-api';
-import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { UmbLitElement, umbFocus } from '@umbraco-cms/backoffice/lit-element';
 import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
 
 import './modal-views/fields-viewer.element.js';
@@ -112,7 +112,8 @@ export class UmbDashboardExamineSearcherElement extends UmbLitElement {
 						id="search-input"
 						placeholder="Type to filter..."
 						label="Type to filter"
-						@keypress=${this._onKeyPress}>
+						@keypress=${this._onKeyPress}
+						${umbFocus()}>
 					</uui-input>
 					<uui-button color="positive" look="primary" label="Search" @click="${this._onSearch}"> Search </uui-button>
 				</div>
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace-editor.element.ts
index 1b1ca191e7..980775ae3e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace-editor.element.ts
@@ -4,8 +4,8 @@ import { UMB_PARTIAL_VIEW_WORKSPACE_CONTEXT } from './partial-view-workspace.con
 import { UMB_TEMPLATE_QUERY_BUILDER_MODAL } from '@umbraco-cms/backoffice/template';
 import type { UmbCodeEditorElement } from '@umbraco-cms/backoffice/code-editor';
 import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui';
-import { css, html, customElement, query, state } from '@umbraco-cms/backoffice/external/lit';
-import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { css, html, customElement, query, state, nothing } from '@umbraco-cms/backoffice/external/lit';
+import { UmbLitElement, umbFocus } from '@umbraco-cms/backoffice/lit-element';
 import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
 
 @customElement('umb-partial-view-workspace-editor')
@@ -20,7 +20,7 @@ export class UmbPartialViewWorkspaceEditorElement extends UmbLitElement {
 	private _ready: boolean = false;
 
 	@state()
-	private _isNew?: boolean = false;
+	private _isNew?: boolean;
 
 	@query('umb-code-editor')
 	private _codeEditor?: UmbCodeEditorElement;
@@ -89,29 +89,36 @@ export class UmbPartialViewWorkspaceEditorElement extends UmbLitElement {
 	}
 
 	render() {
-		return html`<umb-workspace-editor alias="Umb.Workspace.PartialView">
-			<div id="workspace-header" slot="header">
-				<uui-input
-					placeholder="Enter name..."
-					.value=${this._name}
-					@input=${this.#onNameInput}
-					label="Partial view name"
-					?readonly=${this._isNew === false}></uui-input>
-			</div>
-			<uui-box>
-				<div slot="header" id="code-editor-menu-container">
-					<umb-templating-insert-menu @insert=${this.#insertSnippet}></umb-templating-insert-menu>
-					<uui-button look="secondary" id="query-builder-button" label="Query builder" @click=${this.#openQueryBuilder}>
-						<uui-icon name="icon-wand"></uui-icon>Query builder
-					</uui-button>
-				</div>
-				${this._ready
-					? this.#renderCodeEditor()
-					: html`<div id="loader-container">
-							<uui-loader></uui-loader>
-						</div>`}
-			</uui-box>
-		</umb-workspace-editor>`;
+		return this._isNew !== undefined
+			? html`<umb-workspace-editor alias="Umb.Workspace.PartialView">
+					<div id="workspace-header" slot="header">
+						<uui-input
+							placeholder="Enter name..."
+							.value=${this._name}
+							@input=${this.#onNameInput}
+							label="Partial view name"
+							?readonly=${this._isNew === false}
+							${umbFocus()}></uui-input>
+					</div>
+					<uui-box>
+						<div slot="header" id="code-editor-menu-container">
+							<umb-templating-insert-menu @insert=${this.#insertSnippet}></umb-templating-insert-menu>
+							<uui-button
+								look="secondary"
+								id="query-builder-button"
+								label="Query builder"
+								@click=${this.#openQueryBuilder}>
+								<uui-icon name="icon-wand"></uui-icon>Query builder
+							</uui-button>
+						</div>
+						${this._ready
+							? this.#renderCodeEditor()
+							: html`<div id="loader-container">
+									<uui-loader></uui-loader>
+								</div>`}
+					</uui-box>
+				</umb-workspace-editor>`
+			: nothing;
 	}
 
 	static styles = [
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace-editor.element.ts
index a8ba2ef651..54b9155946 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace-editor.element.ts
@@ -1,8 +1,8 @@
 import { UMB_SCRIPT_WORKSPACE_CONTEXT } from './script-workspace.context-token.js';
 import type { UmbCodeEditorElement } from '@umbraco-cms/backoffice/code-editor';
-import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
+import { css, html, customElement, state, nothing } from '@umbraco-cms/backoffice/external/lit';
 import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui';
-import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { UmbLitElement, umbFocus } from '@umbraco-cms/backoffice/lit-element';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 
 @customElement('umb-script-workspace-editor')
@@ -17,7 +17,7 @@ export class UmbScriptWorkspaceEditorElement extends UmbLitElement {
 	private _ready?: boolean = false;
 
 	@state()
-	private _isNew?: boolean = false;
+	private _isNew?: boolean;
 
 	#context?: typeof UMB_SCRIPT_WORKSPACE_CONTEXT.TYPE;
 
@@ -66,25 +66,28 @@ export class UmbScriptWorkspaceEditorElement extends UmbLitElement {
 	}
 
 	render() {
-		return html`<umb-workspace-editor alias="Umb.Workspace.Script">
-			<div id="workspace-header" slot="header">
-				<uui-input
-					placeholder="Enter name..."
-					.value=${this._name}
-					@input=${this.#onNameInput}
-					label="Script name"
-					?readonly=${this._isNew === false}></uui-input>
-			</div>
-			<uui-box>
-				<!-- the div below in the header is to make the box display nicely with code editor -->
-				<div slot="header"></div>
-				${this._ready
-					? this.#renderCodeEditor()
-					: html`<div id="loader-container">
-							<uui-loader></uui-loader>
-						</div>`}
-			</uui-box>
-		</umb-workspace-editor>`;
+		return this._isNew !== undefined
+			? html`<umb-workspace-editor alias="Umb.Workspace.Script">
+					<div id="workspace-header" slot="header">
+						<uui-input
+							placeholder="Enter name..."
+							.value=${this._name}
+							@input=${this.#onNameInput}
+							label="Script name"
+							?readonly=${this._isNew === false}
+							${umbFocus()}></uui-input>
+					</div>
+					<uui-box>
+						<!-- the div below in the header is to make the box display nicely with code editor -->
+						<div slot="header"></div>
+						${this._ready
+							? this.#renderCodeEditor()
+							: html`<div id="loader-container">
+									<uui-loader></uui-loader>
+								</div>`}
+					</uui-box>
+				</umb-workspace-editor>`
+			: nothing;
 	}
 
 	static styles = [
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace-editor.element.ts
index 3adf3431dd..3535ee5154 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace-editor.element.ts
@@ -1,13 +1,13 @@
 import { UMB_STYLESHEET_WORKSPACE_CONTEXT } from './stylesheet-workspace.context-token.js';
 import type { UUIInputElement, UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
-import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
-import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { css, html, customElement, state, nothing } from '@umbraco-cms/backoffice/external/lit';
+import { UmbLitElement, umbFocus } from '@umbraco-cms/backoffice/lit-element';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 
 @customElement('umb-stylesheet-workspace-editor')
 export class UmbStylesheetWorkspaceEditorElement extends UmbLitElement {
 	@state()
-	private _isNew?: boolean = false;
+	private _isNew?: boolean;
 
 	@state()
 	private _name?: string;
@@ -35,20 +35,23 @@ export class UmbStylesheetWorkspaceEditorElement extends UmbLitElement {
 	}
 
 	render() {
-		return html`
-			<umb-workspace-editor alias="Umb.Workspace.StyleSheet">
-				<div id="header" slot="header">
-					<uui-input
-						placeholder="Enter stylesheet name..."
-						label="Stylesheet name"
-						id="name"
-						.value=${this._name}
-						@input="${this.#onNameChange}"
-						?readonly=${this._isNew === false}>
-					</uui-input>
-				</div>
-			</umb-workspace-editor>
-		`;
+		return this._isNew !== undefined
+			? html`
+					<umb-workspace-editor alias="Umb.Workspace.StyleSheet">
+						<div id="header" slot="header">
+							<uui-input
+								placeholder="Enter stylesheet name..."
+								label="Stylesheet name"
+								id="name"
+								.value=${this._name}
+								@input="${this.#onNameChange}"
+								?readonly=${this._isNew === false}
+								${umbFocus()}>
+							</uui-input>
+						</div>
+					</umb-workspace-editor>
+				`
+			: nothing;
 	}
 
 	static styles = [
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts
index 7b886c2723..94887ad0fc 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts
@@ -10,7 +10,7 @@ import { css, html, customElement, query, state, nothing, ifDefined } from '@umb
 import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal';
 import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
 import { UMB_TEMPLATE_PICKER_MODAL } from '@umbraco-cms/backoffice/template';
-import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { UmbLitElement, umbFocus } from '@umbraco-cms/backoffice/lit-element';
 import { Subject, debounceTime } from '@umbraco-cms/backoffice/external/rxjs';
 
 @customElement('umb-template-workspace-editor')
@@ -195,7 +195,8 @@ export class UmbTemplateWorkspaceEditorElement extends UmbLitElement {
 				slot="header"
 				.value=${this._name}
 				@input=${this.#onNameInput}
-				label=${this.localize.term('template_template')}>
+				label=${this.localize.term('template_template')}
+				${umbFocus()}>
 				<uui-input-lock slot="append" value=${ifDefined(this._alias!)} @input=${this.#onAliasInput}></uui-input-lock>
 			</uui-input>
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace-editor.element.ts
index a7b1b2e669..f9a1da1ee5 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace-editor.element.ts
@@ -4,7 +4,7 @@ import { UMB_USER_GROUP_WORKSPACE_CONTEXT } from './user-group-workspace.context
 import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui';
 import { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
 import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit';
-import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { UmbLitElement, umbFocus } from '@umbraco-cms/backoffice/lit-element';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import type { UmbInputDocumentElement } from '@umbraco-cms/backoffice/document';
 import type { UmbInputSectionElement } from '@umbraco-cms/backoffice/section';
@@ -82,7 +82,8 @@ export class UmbUserGroupWorkspaceEditorElement extends UmbLitElement {
 					id="name"
 					label=${this.localize.term('general_name')}
 					.value=${this._userGroup?.name ?? ''}
-					@input="${this.#onNameChange}"></uui-input>
+					@input="${this.#onNameChange}"
+					${umbFocus()}></uui-input>
 			</div>
 		`;
 	}