diff --git a/nummi/main/models.py b/nummi/main/models.py
index 12647d3..a711f5c 100644
--- a/nummi/main/models.py
+++ b/nummi/main/models.py
@@ -93,7 +93,7 @@ class TransactionForm(ModelForm):
 
 
 def invoice_path(instance, filename):
-    return pathlib.Path("invoices", str(instance.id), filename)
+    return pathlib.Path("invoices", str(instance.id)).with_suffix(".pdf")
 
 
 class Invoice(models.Model):
diff --git a/nummi/main/templates/main/tag/transaction_table.html b/nummi/main/templates/main/tag/transaction_table.html
index b27e993..299c513 100644
--- a/nummi/main/templates/main/tag/transaction_table.html
+++ b/nummi/main/templates/main/tag/transaction_table.html
@@ -15,9 +15,11 @@
 		<div class="transaction {% cycle 'w' 'g' %}">
 			<span class="attach center">
 				{% for invoice in trans.invoices %}
-				<a href="{% url "invoice" invoice.id %}">
+				{% spaceless %}
+				<a href="{{ invoice.file.url }}">
 					<i class="fa fa-paperclip"></i>
 				</a>
+				{% endspaceless %}
 				{% endfor %}
 			</span>
 			<span class="date num center">{{ trans.date|date:"Y-m-d" }}</span>
diff --git a/nummi/main/templates/main/transaction.html b/nummi/main/templates/main/transaction.html
index bae7974..07ca350 100644
--- a/nummi/main/templates/main/transaction.html
+++ b/nummi/main/templates/main/transaction.html
@@ -24,7 +24,7 @@
 <div id="invoices">
 	{% for inv in transaction.invoices %}
 		<div class="invoice">
-			<a href="{% url 'invoice' inv.id %}">{{ inv.name }}</a>
+			<a href="{{ inv.file.url }}">{{ inv.name }}</a>
 			<a href="{% url 'del_invoice' transaction.id inv.id %}"
 				 onclick="return confirm('{% translate "Delete" %} <{{ inv.name }}> ?')">
 				<i class="fa-regular fa-trash-can"></i>