diff --git a/apps/Frontend/src/components/patients/add-patient-modal.tsx b/apps/Frontend/src/components/patients/add-patient-modal.tsx
index 43021b4..1d32f80 100644
--- a/apps/Frontend/src/components/patients/add-patient-modal.tsx
+++ b/apps/Frontend/src/components/patients/add-patient-modal.tsx
@@ -36,7 +36,9 @@ interface AddPatientModalProps {
 // Define the ref type
 export type AddPatientModalRef = {
   shouldSchedule: boolean;
+  shouldClaim: boolean;
   navigateToSchedule: (patientId: number) => void;
+  navigateToClaim: (patientId: number) => void;
 };
 
 export const AddPatientModal = forwardRef<
@@ -51,6 +53,7 @@ export const AddPatientModal = forwardRef<
   const isEditing = !!patient;
   const [, navigate] = useLocation();
   const [saveAndSchedule, setSaveAndSchedule] = useState(false);
+  const [saveAndClaim, setSaveAndClaim] = useState(false);
   const patientFormRef = useRef<PatientFormRef>(null); // Ref for PatientForm
 
   // Set up the imperativeHandle to expose functionality to the parent component
@@ -65,9 +68,14 @@ export const AddPatientModal = forwardRef<
 
   useImperativeHandle(ref, () => ({
     shouldSchedule: saveAndSchedule,
+    shouldClaim: saveAndClaim, // ✅ NEW
     navigateToSchedule: (patientId: number) => {
       navigate(`/appointments?newPatient=${patientId}`);
     },
+    navigateToClaim: (patientId: number) => {
+      // ✅ NEW
+      navigate(`/claims?newPatient=${patientId}`);
+    },
   }));
 
   const handleFormSubmit = (data: InsertPatient | UpdatePatient) => {
@@ -79,10 +87,15 @@ export const AddPatientModal = forwardRef<
   };
 
   const handleSaveAndSchedule = () => {
+    setSaveAndClaim(false); // ensure only one flag at a time
     setSaveAndSchedule(true);
-    if (patientFormRef.current) {
-      patientFormRef.current.submit();
-    }
+    patientFormRef.current?.submit();
+  };
+
+  const handleSaveAndClaim = () => {
+    setSaveAndSchedule(false); // ensure only one flag at a time
+    setSaveAndClaim(true);
+    patientFormRef.current?.submit();
   };
 
   return (
@@ -120,6 +133,18 @@ export const AddPatientModal = forwardRef<
             Cancel
           </Button>
 
+          {!isEditing && (
+            <Button
+              variant="outline"
+              className="gap-1"
+              onClick={handleSaveAndClaim}
+              disabled={isLoading}
+            >
+              <Calendar className="h-4 w-4" />
+              Save & Claim
+            </Button>
+          )}
+
           {!isEditing && (
             <Button
               variant="outline"
diff --git a/apps/Frontend/src/pages/claims-page.tsx b/apps/Frontend/src/pages/claims-page.tsx
index 13e6379..0315fc3 100644
--- a/apps/Frontend/src/pages/claims-page.tsx
+++ b/apps/Frontend/src/pages/claims-page.tsx
@@ -165,10 +165,11 @@ export default function ClaimsPage() {
 
   // workflow starts from there - this params are set by pdf extraction/patient page. then used in claim page here.
   const [location] = useLocation();
-  const { name, memberId, dob } = useMemo(() => {
+  const { name, memberId, dob, newPatient } = useMemo(() => {
     const search = window.location.search;
     const params = new URLSearchParams(search);
     return {
+      newPatient: params.get("newPatient"),
       name: params.get("name") || "",
       memberId: params.get("memberId") || "",
       dob: params.get("dob") || "",
@@ -179,7 +180,17 @@ export default function ClaimsPage() {
     setSelectedPatientId(patientId);
     setIsClaimFormOpen(true);
   };
+  // ✅ FIRST: if ?newPatient=<id> is present, open claim form directly
+  useEffect(() => {
+    if (newPatient) {
+      const id = Number(newPatient);
+      if (Number.isFinite(id) && id > 0) {
+        handleNewClaim(id);
+      }
+    }
+  }, [newPatient]);
 
+  // existing flow: only runs when there is no ?newPatient and we have memberId+dob
   useEffect(() => {
     if (memberId && dob) {
       // if matching patient found then simply send its id to claim form,
diff --git a/apps/Frontend/src/pages/patients-page.tsx b/apps/Frontend/src/pages/patients-page.tsx
index 8cda5ad..1b1e43a 100644
--- a/apps/Frontend/src/pages/patients-page.tsx
+++ b/apps/Frontend/src/pages/patients-page.tsx
@@ -22,7 +22,9 @@ import { InsertPatient, Patient } from "@repo/db/types";
 // Type for the ref to access modal methods
 type AddPatientModalRef = {
   shouldSchedule: boolean;
+  shouldClaim: boolean;
   navigateToSchedule: (patientId: number) => void;
+  navigateToClaim: (patientId: number) => void;
 };
 
 export default function PatientsPage() {
@@ -57,9 +59,14 @@ export default function PatientsPage() {
         variant: "default",
       });
 
-      // If the add patient modal wants to proceed to scheduling, redirect to appointments page
+      // ✅ Check claim first, then schedule
+      if (addPatientModalRef.current?.shouldClaim) {
+        addPatientModalRef.current.navigateToClaim(newPatient.id);
+        return;
+      }
       if (addPatientModalRef.current?.shouldSchedule) {
         addPatientModalRef.current.navigateToSchedule(newPatient.id);
+        return;
       }
     },
     onError: (error) => {