diff --git a/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html b/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html
index c4d2a1af7..8230e2157 100644
--- a/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html
+++ b/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html
@@ -1,10 +1,4 @@
 <div class="border border-top-0 rounded-bottom p-3">
-  @if (loading()) {
-    <div class="d-flex align-items-center gap-2">
-      <div class="spinner-border spinner-border-sm" role="status"></div>
-      <span i18n>Loading share link bundles…</span>
-    </div>
-  }
   @if (!loading() && error()) {
     <div class="alert alert-danger mb-0" role="alert">
       {{ error() }}
diff --git a/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.html b/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.html
index 87aa0a1be..053d07cdb 100644
--- a/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.html
+++ b/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.html
@@ -1,10 +1,4 @@
 <div class="border border-top-0 rounded-bottom p-3">
-  @if (loading()) {
-    <div class="d-flex align-items-center gap-2">
-      <div class="spinner-border spinner-border-sm" role="status"></div>
-      <span i18n>Loading share links…</span>
-    </div>
-  }
   @if (!loading() && error()) {
     <div class="alert alert-danger mb-0" role="alert">{{ error() }}</div>
   }
diff --git a/src-ui/src/app/components/manage/share-links/share-links.component.html b/src-ui/src/app/components/manage/share-links/share-links.component.html
index 0dfe2c909..0db06c62e 100644
--- a/src-ui/src/app/components/manage/share-links/share-links.component.html
+++ b/src-ui/src/app/components/manage/share-links/share-links.component.html
@@ -3,6 +3,7 @@
   i18n-title
   info="Manage public links to individual documents and document bundles."
   i18n-info
+  [loading]="loading()"
 ></pngx-page-header>
 
 <ul
@@ -30,4 +31,4 @@
   }
 </ul>
 
-<div [ngbNavOutlet]="nav"></div>
+<div class="bg-body" [ngbNavOutlet]="nav"></div>
diff --git a/src-ui/src/app/components/manage/share-links/share-links.component.ts b/src-ui/src/app/components/manage/share-links/share-links.component.ts
index fed59bbf5..bc7aa156f 100644
--- a/src-ui/src/app/components/manage/share-links/share-links.component.ts
+++ b/src-ui/src/app/components/manage/share-links/share-links.component.ts
@@ -1,4 +1,4 @@
-import { Component, inject, signal } from '@angular/core'
+import { Component, computed, inject, signal, viewChild } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'
 import {
@@ -32,6 +32,15 @@ export class ShareLinksComponent {
 
   readonly ShareLinksNavIDs = ShareLinksNavIDs
   readonly activeNavID = signal(this.getInitialNavID())
+  private readonly documentLinks = viewChild(ShareLinkListComponent)
+  private readonly bundles = viewChild(ShareLinkBundleListComponent)
+  readonly loading = computed(() => {
+    const activeList =
+      this.activeNavID() === ShareLinksNavIDs.DocumentLinks
+        ? this.documentLinks()
+        : this.bundles()
+    return activeList?.loading() ?? true
+  })
 
   get canViewDocumentLinks(): boolean {
     return this.permissionsService.currentUserCan(