diff --git a/apps/backend/fastapi/app/services/versions.py b/apps/backend/fastapi/app/services/versions.py
index 1a4402c..50709c0 100644
--- a/apps/backend/fastapi/app/services/versions.py
+++ b/apps/backend/fastapi/app/services/versions.py
@@ -78,7 +78,10 @@ async def create_branch(
     stmt_refresh = (
         select(CvVersion)
         .where(CvVersion.id == new_version.id)
-        .options(selectinload(CvVersion.patches))
+        .options(
+            selectinload(CvVersion.patches),
+            selectinload(CvVersion.public_assets),
+        )
     )
     result = await session.execute(stmt_refresh)
     return result.scalars().one()
@@ -95,7 +98,10 @@ async def append_patches_to_version(
         select(CvVersion)
         .join(CvVersion.document)
         .where(CvVersion.id == version_id, CvDocument.owner_id == owner_id)
-        .options(selectinload(CvVersion.patches))
+        .options(
+            selectinload(CvVersion.patches),
+            selectinload(CvVersion.public_assets),
+        )
     )
     result = await session.execute(stmt)
     version = result.scalars().one_or_none()
@@ -138,7 +144,10 @@ async def append_patches_to_version(
     stmt_refresh = (
         select(CvVersion)
         .where(CvVersion.id == version_id)
-        .options(selectinload(CvVersion.patches))
+        .options(
+            selectinload(CvVersion.patches),
+            selectinload(CvVersion.public_assets),
+        )
     )
     result = await session.execute(stmt_refresh)
     return result.scalars().one()
diff --git a/apps/webapp/src/app/dashboard/page.tsx b/apps/webapp/src/app/dashboard/page.tsx
index a4c26ab..3681b21 100644
--- a/apps/webapp/src/app/dashboard/page.tsx
+++ b/apps/webapp/src/app/dashboard/page.tsx
@@ -74,8 +74,14 @@ function UploadModal({ onClose, onDone }: { onClose: () => void; onDone: (doc: D
     const submit = async () => {
         if (!title.trim() || !file) { setError('Title and file required.'); return; }
         setLoading(true); setError('');
-        try { onDone(await uploadDocument(title.trim(), desc.trim() || null, file)); }
-        catch (e: unknown) { setError(e instanceof Error ? e.message : 'Upload failed'); setLoading(false); }
+        try {
+            const doc = await uploadDocument(title.trim(), desc.trim() || null, file);
+            await Promise.resolve(onDone(doc));
+        } catch (e: unknown) {
+            setError(e instanceof Error ? e.message : 'Upload failed');
+        } finally {
+            setLoading(false);
+        }
     };
 
     return (
@@ -123,8 +129,14 @@ function BranchModal({
     const submit = async () => {
         if (!name.trim()) { setError('Branch name required.'); return; }
         setLoading(true); setError('');
-        try { onDone(await createBranch(version.id, name.trim(), label.trim() || null, patches as Record<string, unknown>[])); }
-        catch (e: unknown) { setError(e instanceof Error ? e.message : 'Failed'); setLoading(false); }
+        try {
+            const v = await createBranch(version.id, name.trim(), label.trim() || null, patches as Record<string, unknown>[]);
+            await Promise.resolve(onDone(v));
+        } catch (e: unknown) {
+            setError(e instanceof Error ? e.message : 'Failed');
+        } finally {
+            setLoading(false);
+        }
     };
 
     return (
@@ -170,8 +182,14 @@ function SubmissionModal({ version, onClose, onDone }: { version: Version; onClo
     const submit = async () => {
         if (!company.trim() || !role.trim()) { setError('Company and role required.'); return; }
         setLoading(true); setError('');
-        try { onDone(await createSubmission(version.id, company.trim(), role.trim(), url.trim() || null, jd.trim() || null)); }
-        catch (e: unknown) { setError(e instanceof Error ? e.message : 'Failed'); setLoading(false); }
+        try {
+            const s = await createSubmission(version.id, company.trim(), role.trim(), url.trim() || null, jd.trim() || null);
+            await Promise.resolve(onDone(s));
+        } catch (e: unknown) {
+            setError(e instanceof Error ? e.message : 'Failed');
+        } finally {
+            setLoading(false);
+        }
     };
 
     return (
@@ -211,8 +229,12 @@ function PublishModal({ version, onClose, onDone }: { version: Version; onClose:
         setLoading(true); setError('');
         try {
             const asset = await publishVersion(version.id, null, slug.trim() || null);
-            onDone(asset);
-        } catch (e: unknown) { setError(e instanceof Error ? e.message : 'Failed'); setLoading(false); }
+            await Promise.resolve(onDone(asset));
+        } catch (e: unknown) {
+            setError(e instanceof Error ? e.message : 'Failed');
+        } finally {
+            setLoading(false);
+        }
     };
 
     return (