diff --git a/src/routes/clients.$clientId.tsx b/src/routes/clients.$clientId.tsx
index 0630839..8d7c0dd 100644
--- a/src/routes/clients.$clientId.tsx
+++ b/src/routes/clients.$clientId.tsx
@@ -15,7 +15,7 @@ import { ClientCustomFieldsTab } from "@/components/clients/client-custom-fields
 import { formatCurrency, formatDate, formatDateTime, statusBadgeClass } from "@/lib/format";
 import { toast } from "sonner";
 import { downloadStatusReport } from "@/lib/status-pdf";
-import { GenerateInvoiceDialog } from "@/components/invoices/generate-invoice-dialog";
+
 import { TrustAccountPanel } from "@/components/trust/trust-account-panel";
 import { setArchived } from "@/lib/archive";
 
@@ -36,7 +36,6 @@ function ClientDetail() {
   const [statusEntries, setStatusEntries] = useState<any[]>([]);
   const [loading, setLoading] = useState(true);
   const [editOpen, setEditOpen] = useState(false);
-  const [invoiceOpen, setInvoiceOpen] = useState(false);
 
   const load = async () => {
     setLoading(true);
@@ -149,7 +148,7 @@ function ClientDetail() {
                 )}
               </Button>
             )}
-            <Button variant="outline" onClick={() => setInvoiceOpen(true)}>
+            <Button variant="outline" onClick={() => navigate({ to: "/invoices/new/$clientId", params: { clientId: client.id } })}>
               <Receipt className="h-4 w-4 mr-2" /> Generate invoice
             </Button>
             <Button onClick={() => navigate({ to: "/cases/new", search: { clientId: client.id } })}>
@@ -320,12 +319,6 @@ function ClientDetail() {
       </div>
 
       <ClientFormDialog open={editOpen} onOpenChange={setEditOpen} client={client} onSaved={load} />
-      <GenerateInvoiceDialog
-        open={invoiceOpen}
-        onOpenChange={setInvoiceOpen}
-        clientId={client.id}
-        clientName={client.name}
-      />
     </PageContainer>
   );
 }