diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-current-user.element.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-current-user.element.ts
index e3fad1ac29..8784989da5 100644
--- a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-current-user.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-current-user.element.ts
@@ -2,16 +2,16 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { css, CSSResultGroup, html, nothing } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import { UmbModalHandler, UmbModalService, UMB_MODAL_SERVICE_CONTEXT_ALIAS } from '..';
-import type { UserDetails } from '@umbraco-cms/models';
 import {
 	UmbCurrentUserHistoryStore,
 	UmbCurrentUserHistoryItem,
 	UMB_CURRENT_USER_HISTORY_STORE_CONTEXT_ALIAS,
-} from 'src/backoffice/users/current-user/current-user-history.store';
+} from '../../../backoffice/users/current-user/current-user-history.store';
 import {
 	UmbCurrentUserStore,
 	UMB_CURRENT_USER_STORE_CONTEXT_ALIAS,
-} from 'src/backoffice/users/current-user/current-user.store';
+} from '../../../backoffice/users/current-user/current-user.store';
+import type { UserDetails } from '@umbraco-cms/models';
 import { UmbLitElement } from '@umbraco-cms/element';
 
 @customElement('umb-modal-layout-current-user')
diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/modal.service.ts b/src/Umbraco.Web.UI.Client/src/core/modal/modal.service.ts
index 480a8694b3..d974541fb3 100644
--- a/src/Umbraco.Web.UI.Client/src/core/modal/modal.service.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/modal/modal.service.ts
@@ -6,7 +6,6 @@ import './layouts/modal-layout-current-user.element';
 
 import { UUIModalSidebarSize } from '@umbraco-ui/uui-modal-sidebar';
 import { BehaviorSubject } from 'rxjs';
-import { UmbContextAlias } from '../context-api/context-alias';
 import { UmbModalChangePasswordData } from './layouts/modal-layout-change-password.element';
 import type { UmbModalIconPickerData } from './layouts/icon-picker/modal-layout-icon-picker.element';
 
@@ -15,7 +14,8 @@ import './layouts/icon-picker/modal-layout-icon-picker.element';
 import type { UmbModalConfirmData } from './layouts/confirm/modal-layout-confirm.element';
 import type { UmbModalContentPickerData } from './layouts/content-picker/modal-layout-content-picker.element';
 import type { UmbModalPropertyEditorUIPickerData } from './layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element';
-import { UmbModalHandler } from '.';
+import { UmbModalHandler } from './modal-handler';
+import { UmbContextAlias } from '@umbraco-cms/context-api';
 
 export type UmbModalType = 'dialog' | 'sidebar';