diff --git a/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/modals/index.ts b/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/modals/index.ts
index 1a7a4d6fdc..3fcf6dc3f7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/modals/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/modals/index.ts
@@ -2,16 +2,31 @@ import {
 	UMB_DYNAMIC_ROOT_ORIGIN_PICKER_MODAL_ALIAS,
 	UMB_DYNAMIC_ROOT_QUERY_STEP_PICKER_MODAL_ALIAS,
 } from './manifests.js';
+import type {
+	ManifestDynamicRootOrigin,
+	ManifestDynamicRootQueryStep,
+} from '@umbraco-cms/backoffice/extension-registry';
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
-export const UMB_DYNAMIC_ROOT_ORIGIN_PICKER_MODAL = new UmbModalToken(UMB_DYNAMIC_ROOT_ORIGIN_PICKER_MODAL_ALIAS, {
-	modal: {
-		type: 'sidebar',
-		size: 'small',
-	},
-});
+export interface UmbDynamicRootOriginModalData {
+	items: Array<ManifestDynamicRootOrigin>;
+}
 
-export const UMB_DYNAMIC_ROOT_QUERY_STEP_PICKER_MODAL = new UmbModalToken(
+export interface UmbDynamicRootQueryStepModalData {
+	items: Array<ManifestDynamicRootQueryStep>;
+}
+
+export const UMB_DYNAMIC_ROOT_ORIGIN_PICKER_MODAL = new UmbModalToken<UmbDynamicRootOriginModalData>(
+	UMB_DYNAMIC_ROOT_ORIGIN_PICKER_MODAL_ALIAS,
+	{
+		modal: {
+			type: 'sidebar',
+			size: 'small',
+		},
+	},
+);
+
+export const UMB_DYNAMIC_ROOT_QUERY_STEP_PICKER_MODAL = new UmbModalToken<UmbDynamicRootQueryStepModalData>(
 	UMB_DYNAMIC_ROOT_QUERY_STEP_PICKER_MODAL_ALIAS,
 	{
 		modal: {