diff --git a/web/src/lib/components/album-page/album-shared-link.svelte b/web/src/lib/components/album-page/album-shared-link.svelte
index 935fa7837c..580a865ae6 100644
--- a/web/src/lib/components/album-page/album-shared-link.svelte
+++ b/web/src/lib/components/album-page/album-shared-link.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import SharedLinkCopy from '$lib/components/sharedlinks-page/actions/shared-link-copy.svelte';
-  import { handleViewSharedLinkQrCode } from '$lib/services/shared-link.service';
+  import { handleShowSharedLinkQrCode } from '$lib/services/shared-link.service';
   import { locale } from '$lib/stores/preferences.store';
   import type { AlbumResponseDto, SharedLinkResponseDto } from '@immich/sdk';
   import { IconButton, Text } from '@immich/ui';
@@ -46,7 +46,7 @@
       color="secondary"
       variant="ghost"
       icon={mdiQrcode}
-      onclick={() => handleViewSharedLinkQrCode(sharedLink)}
+      onclick={() => handleShowSharedLinkQrCode(sharedLink)}
     />
     <SharedLinkCopy {sharedLink} />
   </div>
diff --git a/web/src/lib/components/album-page/albums-list.svelte b/web/src/lib/components/album-page/albums-list.svelte
index 7b4cae0312..fb8d044b1a 100644
--- a/web/src/lib/components/album-page/albums-list.svelte
+++ b/web/src/lib/components/album-page/albums-list.svelte
@@ -11,7 +11,6 @@
   import AlbumShareModal from '$lib/modals/AlbumShareModal.svelte';
   import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
   import { handleConfirmAlbumDelete, handleDownloadAlbum } from '$lib/services/album.service';
-  import { handleViewSharedLinkQrCode } from '$lib/services/shared-link.service';
   import {
     AlbumFilter,
     AlbumGroupBy,
@@ -255,10 +254,11 @@
           }
 
           case 'sharedLink': {
-            const sharedLink = await modalManager.show(SharedLinkCreateModal, { albumId: selectedAlbum.id });
-            if (sharedLink) {
-              handleSharedLinkCreated(selectedAlbum);
-              await handleViewSharedLinkQrCode(sharedLink);
+            const success = await modalManager.show(SharedLinkCreateModal, { albumId: selectedAlbum.id });
+            if (success) {
+              selectedAlbum.shared = true;
+              selectedAlbum.hasSharedLink = true;
+              updateAlbumInfo(selectedAlbum);
             }
             break;
           }
@@ -346,12 +346,6 @@
       albumToShare = null;
     }
   };
-
-  const handleSharedLinkCreated = (album: AlbumResponseDto) => {
-    album.shared = true;
-    album.hasSharedLink = true;
-    updateAlbumInfo(album);
-  };
 </script>
 
 {#if albums.length > 0}
diff --git a/web/src/lib/components/asset-viewer/actions/share-action.svelte b/web/src/lib/components/asset-viewer/actions/share-action.svelte
index a284d5e364..bfd3312f3b 100644
--- a/web/src/lib/components/asset-viewer/actions/share-action.svelte
+++ b/web/src/lib/components/asset-viewer/actions/share-action.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
   import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
-  import { handleViewSharedLinkQrCode } from '$lib/services/shared-link.service';
   import type { AssetResponseDto } from '@immich/sdk';
   import { IconButton, modalManager } from '@immich/ui';
   import { mdiShareVariantOutline } from '@mdi/js';
@@ -13,10 +12,7 @@
   let { asset }: Props = $props();
 
   const handleClick = async () => {
-    const sharedLink = await modalManager.show(SharedLinkCreateModal, { assetIds: [asset.id] });
-    if (sharedLink) {
-      await handleViewSharedLinkQrCode(sharedLink);
-    }
+    await modalManager.show(SharedLinkCreateModal, { assetIds: [asset.id] });
   };
 </script>
 
diff --git a/web/src/lib/components/timeline/actions/CreateSharedLinkAction.svelte b/web/src/lib/components/timeline/actions/CreateSharedLinkAction.svelte
index 06291e2188..202b87a15b 100644
--- a/web/src/lib/components/timeline/actions/CreateSharedLinkAction.svelte
+++ b/web/src/lib/components/timeline/actions/CreateSharedLinkAction.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { getAssetControlContext } from '$lib/components/timeline/AssetSelectControlBar.svelte';
   import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
-  import { handleViewSharedLinkQrCode } from '$lib/services/shared-link.service';
   import { IconButton, modalManager } from '@immich/ui';
   import { mdiShareVariantOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
@@ -9,13 +8,7 @@
   const { getAssets } = getAssetControlContext();
 
   const handleClick = async () => {
-    const sharedLink = await modalManager.show(SharedLinkCreateModal, {
-      assetIds: [...getAssets()].map(({ id }) => id),
-    });
-
-    if (sharedLink) {
-      await handleViewSharedLinkQrCode(sharedLink);
-    }
+    await modalManager.show(SharedLinkCreateModal, { assetIds: [...getAssets()].map(({ id }) => id) });
   };
 </script>
 
diff --git a/web/src/lib/managers/event-manager.svelte.ts b/web/src/lib/managers/event-manager.svelte.ts
index 7c7717a4d4..44ee524658 100644
--- a/web/src/lib/managers/event-manager.svelte.ts
+++ b/web/src/lib/managers/event-manager.svelte.ts
@@ -1,5 +1,5 @@
 import type { ThemeSetting } from '$lib/managers/theme-manager.svelte';
-import type { LoginResponseDto } from '@immich/sdk';
+import type { LoginResponseDto, SharedLinkResponseDto } from '@immich/sdk';
 
 export type Events = {
   AppInit: [];
@@ -8,6 +8,8 @@ export type Events = {
   AuthLogout: [];
   LanguageChange: [{ name: string; code: string; rtl?: boolean }];
   ThemeChange: [ThemeSetting];
+  SharedLinkCreate: [SharedLinkResponseDto];
+  SharedLinkUpdate: [SharedLinkResponseDto];
 };
 
 type Listener<EventMap extends Record<string, unknown[]>, K extends keyof EventMap> = (...params: EventMap[K]) => void;
diff --git a/web/src/lib/modals/SharedLinkCreateModal.svelte b/web/src/lib/modals/SharedLinkCreateModal.svelte
index b8444705fa..5ba0402752 100644
--- a/web/src/lib/modals/SharedLinkCreateModal.svelte
+++ b/web/src/lib/modals/SharedLinkCreateModal.svelte
@@ -1,26 +1,15 @@
 <script lang="ts">
   import SettingSelect from '$lib/components/shared-components/settings/setting-select.svelte';
+  import { handleCreateSharedLink, handleUpdateSharedLink } from '$lib/services/shared-link.service';
   import { locale } from '$lib/stores/preferences.store';
-  import { handleError } from '$lib/utils/handle-error';
-  import { SharedLinkType, createSharedLink, updateSharedLink, type SharedLinkResponseDto } from '@immich/sdk';
-  import {
-    Button,
-    Field,
-    Input,
-    Modal,
-    ModalBody,
-    ModalFooter,
-    PasswordInput,
-    Switch,
-    Text,
-    toastManager,
-  } from '@immich/ui';
+  import { SharedLinkType, type SharedLinkResponseDto } from '@immich/sdk';
+  import { Button, Field, Input, Modal, ModalBody, ModalFooter, PasswordInput, Switch, Text } from '@immich/ui';
   import { mdiLink } from '@mdi/js';
   import { DateTime, Duration } from 'luxon';
   import { t } from 'svelte-i18n';
 
   interface Props {
-    onClose: (sharedLink?: SharedLinkResponseDto) => void;
+    onClose: (success?: boolean) => void;
     albumId?: string | undefined;
     assetIds?: string[];
     editingLink?: SharedLinkResponseDto | undefined;
@@ -81,56 +70,46 @@
     assetIds = editingLink.assets.map(({ id }) => id);
   }
 
-  const handleCreateSharedLink = async () => {
-    const expirationDate = expirationOption > 0 ? DateTime.now().plus(expirationOption).toISO() : undefined;
+  const onCreate = async () => {
+    const success = await handleCreateSharedLink({
+      type: shareType,
+      albumId,
+      assetIds,
+      expiresAt: expirationOption > 0 ? DateTime.now().plus(expirationOption).toISO() : undefined,
+      allowUpload,
+      description,
+      password,
+      allowDownload,
+      showMetadata,
+      slug,
+    });
 
-    try {
-      const data = await createSharedLink({
-        sharedLinkCreateDto: {
-          type: shareType,
-          albumId,
-          assetIds,
-          expiresAt: expirationDate,
-          allowUpload,
-          description,
-          password,
-          allowDownload,
-          showMetadata,
-          slug,
-        },
-      });
-      onClose(data);
-    } catch (error) {
-      handleError(error, $t('errors.failed_to_create_shared_link'));
+    if (success) {
+      onClose(true);
     }
   };
 
-  const handleEditLink = async () => {
+  const onUpdate = async () => {
     if (!editingLink) {
       return;
     }
 
-    try {
-      const expirationDate = expirationOption > 0 ? DateTime.now().plus(expirationOption).toISO() : null;
+    const success = await handleUpdateSharedLink(editingLink, {
+      description,
+      password: password ?? null,
+      expiresAt: shouldChangeExpirationTime
+        ? expirationOption > 0
+          ? DateTime.now().plus(expirationOption).toISO()
+          : null
+        : undefined,
+      allowUpload,
+      allowDownload,
+      showMetadata,
+      slug: slug.trim() ?? null,
+    });
 
-      const updatedLink = await updateSharedLink({
-        id: editingLink.id,
-        sharedLinkEditDto: {
-          description,
-          password: password ?? null,
-          expiresAt: shouldChangeExpirationTime ? expirationDate : undefined,
-          allowUpload,
-          allowDownload,
-          showMetadata,
-          slug: slug.trim() ?? null,
-        },
-      });
-
-      toastManager.success($t('saved'));
-
-      onClose(updatedLink);
-    } catch (error) {
-      handleError(error, $t('errors.failed_to_edit_shared_link'));
+    if (success) {
+      onClose(true);
     }
   };
 
@@ -219,9 +198,9 @@
 
   <ModalFooter>
     {#if editingLink}
-      <Button fullWidth onclick={handleEditLink}>{$t('confirm')}</Button>
+      <Button fullWidth onclick={onUpdate}>{$t('confirm')}</Button>
     {:else}
-      <Button fullWidth onclick={handleCreateSharedLink}>{$t('create_link')}</Button>
+      <Button fullWidth onclick={onCreate}>{$t('create_link')}</Button>
     {/if}
   </ModalFooter>
 </Modal>
diff --git a/web/src/lib/services/shared-link.service.ts b/web/src/lib/services/shared-link.service.ts
index 35bde6784f..529b6b23b4 100644
--- a/web/src/lib/services/shared-link.service.ts
+++ b/web/src/lib/services/shared-link.service.ts
@@ -1,9 +1,17 @@
+import { eventManager } from '$lib/managers/event-manager.svelte';
 import QrCodeModal from '$lib/modals/QrCodeModal.svelte';
 import { serverConfig } from '$lib/stores/server-config.store';
 import { copyToClipboard } from '$lib/utils';
+import { handleError } from '$lib/utils/handle-error';
 import { getFormatter } from '$lib/utils/i18n';
-import type { SharedLinkResponseDto } from '@immich/sdk';
-import { modalManager } from '@immich/ui';
+import {
+  createSharedLink,
+  updateSharedLink,
+  type SharedLinkCreateDto,
+  type SharedLinkEditDto,
+  type SharedLinkResponseDto,
+} from '@immich/sdk';
+import { modalManager, toastManager } from '@immich/ui';
 import { get } from 'svelte/store';
 
 const makeSharedLinkUrl = (sharedLink: SharedLinkResponseDto) => {
@@ -11,7 +19,42 @@ const makeSharedLinkUrl = (sharedLink: SharedLinkResponseDto) => {
   return new URL(path, get(serverConfig).externalDomain || globalThis.location.origin).href;
 };
 
-export const handleViewSharedLinkQrCode = async (sharedLink: SharedLinkResponseDto) => {
+export const handleCreateSharedLink = async (dto: SharedLinkCreateDto) => {
+  const $t = await getFormatter();
+
+  try {
+    const sharedLink = await createSharedLink({ sharedLinkCreateDto: dto });
+
+    eventManager.emit('SharedLinkCreate', sharedLink);
+
+    // prevent nested modal
+    void handleShowSharedLinkQrCode(sharedLink);
+
+    return true;
+  } catch (error) {
+    handleError(error, $t('errors.failed_to_create_shared_link'));
+    return false;
+  }
+};
+
+export const handleUpdateSharedLink = async (sharedLink: SharedLinkResponseDto, dto: SharedLinkEditDto) => {
+  const $t = await getFormatter();
+
+  try {
+    const response = await updateSharedLink({ id: sharedLink.id, sharedLinkEditDto: dto });
+
+    eventManager.emit('SharedLinkUpdate', { album: sharedLink.album, ...response });
+
+    toastManager.success($t('saved'));
+
+    return true;
+  } catch (error) {
+    handleError(error, $t('errors.failed_to_edit_shared_link'));
+    return false;
+  }
+};
+
+export const handleShowSharedLinkQrCode = async (sharedLink: SharedLinkResponseDto) => {
   const $t = await getFormatter();
   await modalManager.show(QrCodeModal, { title: $t('view_link'), value: makeSharedLinkUrl(sharedLink) });
 };
diff --git a/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte
index 1c8a6ccfa0..6b543e1ecf 100644
--- a/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -8,6 +8,7 @@
   import AlbumTitle from '$lib/components/album-page/album-title.svelte';
   import ActivityStatus from '$lib/components/asset-viewer/activity-status.svelte';
   import ActivityViewer from '$lib/components/asset-viewer/activity-viewer.svelte';
+  import OnEvents from '$lib/components/OnEvents.svelte';
   import ButtonContextMenu from '$lib/components/shared-components/context-menu/button-context-menu.svelte';
   import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
   import ControlAppBar from '$lib/components/shared-components/control-app-bar.svelte';
@@ -36,7 +37,6 @@
   import AlbumUsersModal from '$lib/modals/AlbumUsersModal.svelte';
   import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
   import { handleConfirmAlbumDelete, handleDownloadAlbum } from '$lib/services/album.service';
-  import { handleViewSharedLinkQrCode } from '$lib/services/shared-link.service';
   import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
   import { featureFlags } from '$lib/stores/server-config.store';
@@ -384,12 +384,12 @@
     }
   };
 
+  const onSharedLinkCreate = async () => {
+    await refreshAlbum();
+  };
+
   const handleShareLink = async () => {
-    const sharedLink = await modalManager.show(SharedLinkCreateModal, { albumId: album.id });
-    if (sharedLink) {
-      await refreshAlbum();
-      await handleViewSharedLinkQrCode(sharedLink);
-    }
+    await modalManager.show(SharedLinkCreateModal, { albumId: album.id });
   };
 
   const handleEditUsers = async () => {
@@ -424,6 +424,8 @@
   };
 </script>
 
+<OnEvents {onSharedLinkCreate} />
+
 <div class="flex overflow-hidden" use:scrollMemoryClearer={{ routeStartsWith: AppRoute.ALBUMS }}>
   <div class="relative w-full shrink">
     <main class="relative h-dvh overflow-hidden px-2 md:px-6 max-md:pt-(--navbar-height-md) pt-(--navbar-height)">
diff --git a/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte b/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte
index 2aa24a57ba..4b63ce71a1 100644
--- a/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte
+++ b/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte
@@ -2,6 +2,7 @@
   import { goto } from '$app/navigation';
   import { page } from '$app/state';
   import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';
+  import OnEvents from '$lib/components/OnEvents.svelte';
   import SharedLinkCard from '$lib/components/sharedlinks-page/shared-link-card.svelte';
   import { AppRoute } from '$lib/constants';
   import GroupTab from '$lib/elements/GroupTab.svelte';
@@ -50,18 +51,6 @@
     }
   };
 
-  const handleEditDone = async (updatedLink?: SharedLinkResponseDto) => {
-    if (updatedLink) {
-      const index = sharedLinks.findIndex((link) => link.id === updatedLink.id);
-      if (index !== -1) {
-        sharedLinks[index] = updatedLink;
-      }
-    } else {
-      await refresh();
-    }
-    await goto(AppRoute.SHARED_LINKS);
-  };
-
   type Filter = 'all' | 'album' | 'individual';
 
   const filterMap: Record<Filter, string> = {
@@ -91,8 +80,17 @@
         (type === SharedLinkType.Individual && selectedTab === 'individual'),
     ),
   );
+
+  const onSharedLinkUpdate = (sharedLink: SharedLinkResponseDto) => {
+    const index = sharedLinks.findIndex((link) => link.id === sharedLink.id);
+    if (index !== -1) {
+      sharedLinks[index] = sharedLink;
+    }
+  };
 </script>
 
+<OnEvents {onSharedLinkUpdate} />
+
 <UserPageLayout title={data.meta.title}>
   {#snippet buttons()}
     <div class="hidden xl:block h-10">
@@ -116,7 +114,7 @@
     {/if}
 
     {#if sharedLink}
-      <SharedLinkCreateModal editingLink={sharedLink} onClose={handleEditDone} />
+      <SharedLinkCreateModal editingLink={sharedLink} onClose={() => goto(AppRoute.SHARED_LINKS)} />
     {/if}
   </div>
 </UserPageLayout>