diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/manifests.ts
index b5078f80de..1249f74d6d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/manifests.ts
@@ -24,7 +24,7 @@ export const manifests: Array<ManifestTypes> = [
 	{
 		type: 'workspace',
 		kind: 'routable',
-		name: 'Block List Type Workspace',
+		name: 'Block Workspace',
 		alias: UMB_BLOCK_WORKSPACE_ALIAS,
 		api: () => import('./block-workspace.context.js'),
 		meta: {
@@ -61,7 +61,7 @@ export const manifests: Array<ManifestTypes> = [
 		alias: 'Umb.WorkspaceView.Block.Settings',
 		name: 'Block Workspace Settings View',
 		js: () => import('./views/edit/block-workspace-view-edit.element.js'),
-		weight: 1000,
+		weight: 900,
 		meta: {
 			label: '#general_settings',
 			pathname: 'settings',
@@ -78,7 +78,7 @@ export const manifests: Array<ManifestTypes> = [
 			},
 			{
 				alias: 'Umb.Condition.Switch',
-				frequency: '2000000000'
+				frequency: '2000'
 			}
 		],
 	} as any,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-views/workspace-fallback-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/components/not-found/route-not-found.element.ts
similarity index 82%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-views/workspace-fallback-view.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/router/components/not-found/route-not-found.element.ts
index 231ee4a5ea..9f57591368 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-views/workspace-fallback-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/router/components/not-found/route-not-found.element.ts
@@ -6,8 +6,8 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
  * A fallback view to be used in Workspace Views, maybe this can be upgraded at a later point.
  */
 // TODO: Rename and move this file to a more generic place.
-@customElement('umb-workspace-fallback-view')
-export class UmbWorkspaceFallbackViewElement extends UmbLitElement {
+@customElement('umb-route-not-found')
+export class UmbRouteNotFoundElement extends UmbLitElement {
 
 	override render() {
 		return html`
@@ -47,10 +47,10 @@ export class UmbWorkspaceFallbackViewElement extends UmbLitElement {
 	];
 }
 
-export default UmbWorkspaceFallbackViewElement;
+export default UmbRouteNotFoundElement;
 
 declare global {
 	interface HTMLElementTagNameMap {
-		'umb-workspace-fallback-view': UmbWorkspaceFallbackViewElement;
+		'umb-route-not-found': UmbRouteNotFoundElement;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/router/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/index.ts
index fc2663470f..387eb72b4e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/router/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/router/index.ts
@@ -9,3 +9,4 @@ export * from './path-pattern.class.js';
 export * from './modal-registration/modal-route-registration.interface.js';
 export * from './modal-registration/modal-route-registration.controller.js';
 export * from './types.js';
+export * from './components/not-found/route-not-found.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts
index 43640abca6..be6e3ac0f2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts
@@ -74,7 +74,7 @@ export class UmbWorkspaceEditorElement extends UmbLitElement {
 
 		newRoutes.push({
 			path: `**`,
-			component: () => import('../workspace-views/workspace-fallback-view.element.js'),
+			component: async () => (await import('@umbraco-cms/backoffice/router')).UmbRouteNotFoundElement,
 		});
 
 		this._routes = newRoutes;