diff --git a/pkg/invoices.go b/pkg/invoices.go
index f7c5672..305ca44 100644
--- a/pkg/invoices.go
+++ b/pkg/invoices.go
@@ -144,7 +144,7 @@ func ServeInvoice(w http.ResponseWriter, r *http.Request, params httprouter.Para
 		w.Header().Set("Content-Type", "application/pdf")
 		mustWriteInvoicePdf(w, r, inv)
 	} else {
-		mustRenderAppTemplate(w, r, "invoices/view.gohtml", inv)
+		mustRenderMainTemplate(w, r, "invoices/view.gohtml", inv)
 	}
 }
 
diff --git a/web/template/invoices/index.gohtml b/web/template/invoices/index.gohtml
index 283d5e8..d057c7a 100644
--- a/web/template/invoices/index.gohtml
+++ b/web/template/invoices/index.gohtml
@@ -49,7 +49,7 @@
                                aria-label="{{ $title }}"
                                title="{{ $title }}"/></td>
                     <td>{{ .Date|formatDate }}</td>
-                    <td><a href="{{ companyURI "/invoices/"}}{{ .Slug }}">{{ .Number }}</a></td>
+                    <td><a href="{{ companyURI "/invoices/"}}{{ .Slug }}" data-hx-target="main" data-hx-boost="true">{{ .Number }}</a></td>
                     <td>{{ .CustomerName }}</td>
                     <td>
                         <details class="invoice-status menu">
@@ -76,7 +76,7 @@
                     <td>
                         {{- range $index, $tag := .Tags }}
                             {{- if gt $index 0 }}, {{ end -}}
-                            <a href="?tag={{ . }}">{{ . }}</a>
+                            <a href="?tag={{ . }}" data-hx-target="main" data-hx-boost="true">{{ . }}</a>
                         {{- end }}
                     </td>
                     <td class="numeric">{{ .Total|formatPrice }}</td>