diff --git a/solid-invoicing.js b/solid-invoicing.js
index 19743e5528a533222209927aff9d4cfbccd033f8..a9c27d43ab7d4c076904990b1aaffd78c8a9eb39 100644
--- a/solid-invoicing.js
+++ b/solid-invoicing.js
@@ -38,9 +38,11 @@ export class SolidInvoicing extends SolidTemplateElement {
       // remove no-render to populate the recap
       if (e.target === this.querySelector('#invoice-router') && e.detail.route === "invoices-summary") {
         const customerDisplay = this.querySelector('#customer-invoices');
+        const customerForm = this.querySelector('#new-customer-invoice');
         const freelancerDisplay = this.querySelector('#freelancer-invoices');
         if (customerDisplay.hasAttribute('no-render')) customerDisplay.removeAttribute('no-render');
         if (freelancerDisplay.hasAttribute('no-render')) freelancerDisplay.removeAttribute('no-render');
+        if (customerForm.hasAttribute('no-render')) customerForm.removeAttribute('no-render');
       }
       if (e.detail.route === "edit-invoice") {
         const editForm = this.querySelector('#edit-customer-invoice');
@@ -556,6 +558,7 @@ export class SolidInvoicing extends SolidTemplateElement {
           <h3 class="text-color-heading">${this.localize('title.invoice_create')}</h3>
 
           <solid-form
+            id="new-customer-invoice"
             class="new-customer-invoice-form segment full whitespace-normal js-calculate-totals"
             data-src="${dataSrc}"
             nested-field="customerInvoices"