diff --git a/packages/ui/src/components/views/FilesView.tsx b/packages/ui/src/components/views/FilesView.tsx
index 14437ad9..aef44a7a 100644
--- a/packages/ui/src/components/views/FilesView.tsx
+++ b/packages/ui/src/components/views/FilesView.tsx
@@ -750,7 +750,7 @@ export const FilesView: React.FC = () => {
       addDraft({
         sessionKey,
         source: 'file',
-        fileLabel: selectedFile.name,
+        fileLabel: selectedFile.path,
         startLine: finalRange.start,
         endLine: finalRange.end,
         code,
@@ -1765,7 +1765,7 @@ export const FilesView: React.FC = () => {
     const sessionDrafts = allDrafts[sessionKey] ?? [];
     // Filter drafts for current file
     const fileDrafts = sessionDrafts.filter(
-      (d) => d.source === 'file' && d.fileLabel === selectedFile.name
+      (d) => d.source === 'file' && d.fileLabel === selectedFile.path
     );
 
     const widgets: BlockWidgetDef[] = [];
diff --git a/packages/ui/src/components/views/PierreDiffViewer.tsx b/packages/ui/src/components/views/PierreDiffViewer.tsx
index 96549301..ceada607 100644
--- a/packages/ui/src/components/views/PierreDiffViewer.tsx
+++ b/packages/ui/src/components/views/PierreDiffViewer.tsx
@@ -264,7 +264,6 @@ export const PierreDiffViewer: React.FC<PierreDiffViewerProps> = ({
       return;
     }
 
-    const fileLabel = fileName ? fileName.split('/').pop() || 'unknown' : 'unknown';
     // Pierre selection range: { start, end, side }
     // Store needs { startLine, endLine, side: 'original'|'modified' }
     // Pierre side: 'additions' (right) | 'deletions' (left)
@@ -275,7 +274,7 @@ export const PierreDiffViewer: React.FC<PierreDiffViewerProps> = ({
 
     if (editingDraftId) {
       updateDraft(sessionKey, editingDraftId, {
-        fileLabel,
+        fileLabel: fileName || 'unknown',
         startLine: targetRange.start,
         endLine: targetRange.end,
         side: storeSide,
@@ -287,7 +286,7 @@ export const PierreDiffViewer: React.FC<PierreDiffViewerProps> = ({
       addDraft({
         sessionKey,
         source: 'diff',
-        fileLabel,
+        fileLabel: fileName || 'unknown',
         startLine: targetRange.start,
         endLine: targetRange.end,
         side: storeSide,
@@ -436,7 +435,7 @@ export const PierreDiffViewer: React.FC<PierreDiffViewerProps> = ({
 
     const sessionDrafts = allDrafts[sessionKey] ?? [];
     // Match file label logic - use basename
-    const fileLabel = fileName ? fileName.split('/').pop() || 'unknown' : 'unknown';
+    const fileLabel = fileName || 'unknown';
     const fileDrafts = sessionDrafts.filter((d) => d.source === 'diff' && d.fileLabel === fileLabel);
 
     const anns: DiffLineAnnotation<AnnotationData>[] = [];