diff --git a/app/epd/patients/[id]/components/patient-layout-client.tsx b/app/epd/patients/[id]/components/patient-layout-client.tsx
index 1a5de67..417bf8d 100644
--- a/app/epd/patients/[id]/components/patient-layout-client.tsx
+++ b/app/epd/patients/[id]/components/patient-layout-client.tsx
@@ -1,10 +1,9 @@
 'use client';
 
-import { useMemo, useState } from 'react';
+import { useMemo } from 'react';
 import type { ReactNode } from 'react';
 import type { FHIRPatient } from '@/lib/fhir';
 import { ClientHeader } from './client-header';
-import { RapportageModal } from '../rapportage/components/rapportage-modal';
 
 interface PatientLayoutClientProps {
   patient: FHIRPatient;
@@ -13,8 +12,6 @@ interface PatientLayoutClientProps {
 }
 
 export function PatientLayoutClient({ patient, patientId, children }: PatientLayoutClientProps) {
-  const [isModalOpen, setModalOpen] = useState(false);
-
   const patientName = useMemo(() => {
     const name = patient.name?.[0];
     if (!name) return 'deze patiënt';
@@ -29,14 +26,8 @@ export function PatientLayoutClient({ patient, patientId, children }: PatientLay
 
   return (
     <div className="flex h-full flex-1 flex-col bg-white">
-      <ClientHeader patient={patient} onNewReport={() => setModalOpen(true)} />
+      <ClientHeader patient={patient} focusElementId="rapportage-composer" />
       <div className="flex-1 overflow-auto bg-slate-50">{children}</div>
-      <RapportageModal
-        isOpen={isModalOpen}
-        onClose={() => setModalOpen(false)}
-        patientId={patientId}
-        patientName={patientName}
-      />
     </div>
   );
 }