diff --git a/src/components/forms/estoppel-form.tsx b/src/components/forms/estoppel-form.tsx
index a2c7d62..51c5b16 100644
--- a/src/components/forms/estoppel-form.tsx
+++ b/src/components/forms/estoppel-form.tsx
@@ -15,6 +15,7 @@ import {
   type FirmInfo,
 } from "@/lib/forms-shared";
 import { fillTokens, loadFormTemplate, type FormTemplateConfig } from "@/lib/form-templates";
+import { promptFilename } from "@/lib/prompt-filename";
 import { jsPDF } from "jspdf";
 import { toast } from "sonner";
 
@@ -266,7 +267,9 @@ export function EstoppelForm() {
       doc.text(al, margin, y);
     }
 
-    doc.save(`Estoppel_${parcelId || "draft"}_${date}.pdf`);
+    const name = promptFilename(`Estoppel_${parcelId || "draft"}_${date}`, "pdf");
+    if (!name) return;
+    doc.save(`${name}.pdf`);
     toast.success("Estoppel PDF downloaded");
   };
 
diff --git a/src/components/forms/itf-form.tsx b/src/components/forms/itf-form.tsx
index 47e2a24..21f6c22 100644
--- a/src/components/forms/itf-form.tsx
+++ b/src/components/forms/itf-form.tsx
@@ -16,6 +16,7 @@ import {
   type FirmInfo,
 } from "@/lib/forms-shared";
 import { buildLetterTokens, loadFormTemplate, renderLetterPdf, type FormTemplateConfig } from "@/lib/form-templates";
+import { promptFilename } from "@/lib/prompt-filename";
 import { toast } from "sonner";
 
 export function ItfForm() {
@@ -106,7 +107,9 @@ export function ItfForm() {
       filename: `ITF_${ownerFullName(homeowner) || "draft"}_${letterDate}`,
     });
 
-    doc.save(`ITF_${ownerFullName(homeowner) || "draft"}_${letterDate}.pdf`);
+    const name = promptFilename(`ITF_${ownerFullName(homeowner) || "draft"}_${letterDate}`, "pdf");
+    if (!name) return;
+    doc.save(`${name}.pdf`);
     toast.success("ITF PDF downloaded");
   };
 
diff --git a/src/components/forms/itl-form.tsx b/src/components/forms/itl-form.tsx
index 74dedd9..15722fc 100644
--- a/src/components/forms/itl-form.tsx
+++ b/src/components/forms/itl-form.tsx
@@ -16,6 +16,7 @@ import {
   type FirmInfo,
 } from "@/lib/forms-shared";
 import { buildLetterTokens, loadFormTemplate, renderLetterPdf, type FormTemplateConfig } from "@/lib/form-templates";
+import { promptFilename } from "@/lib/prompt-filename";
 import { toast } from "sonner";
 
 export function ItlForm() {
@@ -95,7 +96,9 @@ export function ItlForm() {
       filename: `ITL_${ownerFullName(homeowner) || "draft"}_${letterDate}`,
     });
 
-    doc.save(`ITL_${ownerFullName(homeowner) || "draft"}_${letterDate}.pdf`);
+    const name = promptFilename(`ITL_${ownerFullName(homeowner) || "draft"}_${letterDate}`, "pdf");
+    if (!name) return;
+    doc.save(`${name}.pdf`);
     toast.success("ITL PDF downloaded");
   };
 
diff --git a/src/components/forms/letter-generator.tsx b/src/components/forms/letter-generator.tsx
index 8342947..c16e289 100644
--- a/src/components/forms/letter-generator.tsx
+++ b/src/components/forms/letter-generator.tsx
@@ -17,6 +17,7 @@ import {
   type FirmInfo,
 } from "@/lib/forms-shared";
 import { fillTokens, loadFormTemplate, type FormTemplateConfig } from "@/lib/form-templates";
+import { promptFilename } from "@/lib/prompt-filename";
 import { supabase } from "@/integrations/supabase/client";
 import { jsPDF } from "jspdf";
 import { toast } from "sonner";
@@ -290,7 +291,9 @@ export function LetterGenerator() {
       }
     }
 
-    doc.save(`Letter_${date}.pdf`);
+    const name = promptFilename(`Letter_${date}`, "pdf");
+    if (!name) return;
+    doc.save(`${name}.pdf`);
     toast.success("Letter PDF downloaded");
   };
 
diff --git a/src/components/forms/nola-form.tsx b/src/components/forms/nola-form.tsx
index 7f1ca25..a5d4f29 100644
--- a/src/components/forms/nola-form.tsx
+++ b/src/components/forms/nola-form.tsx
@@ -15,6 +15,7 @@ import {
   type FirmInfo,
 } from "@/lib/forms-shared";
 import { buildLetterTokens, loadFormTemplate, renderLetterPdf, type FormTemplateConfig } from "@/lib/form-templates";
+import { promptFilename } from "@/lib/prompt-filename";
 import { toast } from "sonner";
 
 interface Item {
@@ -94,7 +95,9 @@ export function NolaForm() {
       filename: `NOLA_${ownerFullName(homeowner) || "draft"}_${date}`,
     });
 
-    doc.save(`NOLA_${ownerFullName(homeowner) || "draft"}_${date}.pdf`);
+    const name = promptFilename(`NOLA_${ownerFullName(homeowner) || "draft"}_${date}`, "pdf");
+    if (!name) return;
+    doc.save(`${name}.pdf`);
     toast.success("NOLA PDF downloaded");
   };