diff --git a/web/template/invoices/edit.gohtml b/web/template/invoices/edit.gohtml
index 1e4f02c..84c8aec 100644
--- a/web/template/invoices/edit.gohtml
+++ b/web/template/invoices/edit.gohtml
@@ -17,7 +17,10 @@
     {{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.editInvoicePage*/ -}}
     <section id="invoice-dialog-content" data-hx-target="main">
         <h2>{{ printf (pgettext "Edit Invoice “%s”" "title") .Number }}</h2>
-        <form method="POST" action="{{ companyURI "/invoices/" }}{{ .Slug }}/edit" data-hx-boost="true">
+        <form method="POST" action="{{ companyURI "/invoices/" }}{{ .Slug }}/edit"
+              data-hx-boost="true"
+              data-hx-swap="innerHTML show:false"
+        >
             {{ csrfToken }}
 
             {{ with .Form -}}
@@ -78,7 +81,8 @@
                 <button formnovalidate
                         name="action" value="select-products"
                         data-hx-get="{{ companyURI "/invoices/product-form" }}"
-                        data-hx-target="#invoice-summary" data-hx-swap="beforebegin"
+                        data-hx-target="#invoice-summary"
+                        data-hx-swap="beforebegin show:bottom"
                         data-hx-select="unset"
                         data-hx-vals="js:{index: document.querySelectorAll('.new-invoice-product').length}"
                         type="submit">{{( pgettext "Add products" "action" )}}</button>
diff --git a/web/template/invoices/new.gohtml b/web/template/invoices/new.gohtml
index a3013ca..ae5e43e 100644
--- a/web/template/invoices/new.gohtml
+++ b/web/template/invoices/new.gohtml
@@ -17,7 +17,10 @@
     {{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.newInvoicePage*/ -}}
     <section id="invoice-dialog-content" data-hx-target="main">
         <h2>{{(pgettext "New Invoice" "title")}}</h2>
-        <form method="POST" action="{{ companyURI "/invoices/new" }}" data-hx-boost="true">
+        <form method="POST" action="{{ companyURI "/invoices/new" }}"
+              data-hx-boost="true"
+              data-hx-swap="innerHTML show:false"
+        >
             {{ csrfToken }}
 
             {{ with .Form -}}
@@ -77,7 +80,8 @@
                 <button formnovalidate
                         name="action" value="select-products"
                         data-hx-get="{{ companyURI "/invoices/product-form" }}"
-                        data-hx-target="#invoice-summary" data-hx-swap="beforebegin"
+                        data-hx-target="#invoice-summary"
+                        data-hx-swap="beforebegin show:bottom"
                         data-hx-select="unset"
                         data-hx-vals="js:{index: document.querySelectorAll('.new-invoice-product').length}"
                         type="submit">{{( pgettext "Add products" "action" )}}</button>
diff --git a/web/template/quotes/edit.gohtml b/web/template/quotes/edit.gohtml
index fe6066d..216c5f6 100644
--- a/web/template/quotes/edit.gohtml
+++ b/web/template/quotes/edit.gohtml
@@ -17,7 +17,10 @@
     {{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.editQuotationPage*/ -}}
     <section id="quote-dialog-content" data-hx-target="main">
         <h2>{{ printf (pgettext "Edit Quotation “%s”" "title") .Number }}</h2>
-        <form method="POST" action="{{ companyURI "/quotes/" }}{{ .Slug }}/edit" data-hx-boost="true">
+        <form method="POST" action="{{ companyURI "/quotes/" }}{{ .Slug }}/edit"
+              data-hx-boost="true"
+              data-hx-swap="innerHTML show:false"
+        >
             {{ csrfToken }}
 
             {{ with .Form -}}
@@ -79,7 +82,8 @@
                 <button formnovalidate
                         name="action" value="select-products"
                         data-hx-get="{{ companyURI "/quotes/product-form" }}"
-                        data-hx-target="#quote-summary" data-hx-swap="beforebegin"
+                        data-hx-target="#quote-summary"
+                        data-hx-swap="beforebegin show:bottom"
                         data-hx-select="unset"
                         data-hx-vals="js:{index: document.querySelectorAll('.new-quote-product').length}"
                         type="submit">{{( pgettext "Add products" "action" )}}</button>
diff --git a/web/template/quotes/new.gohtml b/web/template/quotes/new.gohtml
index e96a2b5..d6c9eaf 100644
--- a/web/template/quotes/new.gohtml
+++ b/web/template/quotes/new.gohtml
@@ -17,7 +17,10 @@
     {{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.newQuotePage*/ -}}
     <section id="quote-dialog-content" data-hx-target="main">
         <h2>{{(pgettext "New Quotation" "title")}}</h2>
-        <form method="POST" action="{{ companyURI "/quotes/new" }}" data-hx-boost="true">
+        <form method="POST" action="{{ companyURI "/quotes/new" }}"
+              data-hx-boost="true"
+              data-hx-swap="innerHTML show:false"
+        >
             {{ csrfToken }}
 
             {{ with .Form -}}
@@ -78,7 +81,8 @@
                 <button formnovalidate
                         name="action" value="select-products"
                         data-hx-get="{{ companyURI "/quotes/product-form" }}"
-                        data-hx-target="#quote-summary" data-hx-swap="beforebegin"
+                        data-hx-target="#quote-summary"
+                        data-hx-swap="beforebegin show:bottom"
                         data-hx-select="unset"
                         data-hx-vals="js:{index: document.querySelectorAll('.new-quote-product').length}"
                         type="submit">{{( pgettext "Add products" "action" )}}</button>