diff --git a/frontend/src/lib/components/PdfViewer.svelte b/frontend/src/lib/components/PdfViewer.svelte
index cd51b52a..1a9ff68a 100644
--- a/frontend/src/lib/components/PdfViewer.svelte
+++ b/frontend/src/lib/components/PdfViewer.svelte
@@ -452,18 +452,20 @@ function zoomOut() {
 			{/if}
 		</div>
 
-		{#if activeAnnotationId}
-			<AnnotationCommentPanel
-				documentId={documentId}
-				annotationId={activeAnnotationId}
-				canComment={canComment ?? false}
-				currentUserId={currentUserId ?? null}
-				canAdmin={canAdmin ?? false}
-				onClose={() => (activeAnnotationId = null)}
-				onCountChange={(count) => {
-					if (activeAnnotationId) commentCounts.set(activeAnnotationId, count);
-				}}
-			/>
-		{/if}
+		{#key activeAnnotationId}
+			{#if activeAnnotationId}
+				<AnnotationCommentPanel
+					documentId={documentId}
+					annotationId={activeAnnotationId}
+					canComment={canComment ?? false}
+					currentUserId={currentUserId ?? null}
+					canAdmin={canAdmin ?? false}
+					onClose={() => (activeAnnotationId = null)}
+					onCountChange={(count) => {
+						if (activeAnnotationId) commentCounts.set(activeAnnotationId, count);
+					}}
+				/>
+			{/if}
+		{/key}
 	</div>
 {/if}