diff --git a/web/static/invoice.css b/web/static/invoice.css
index 85cb1f1..d923c91 100644
--- a/web/static/invoice.css
+++ b/web/static/invoice.css
@@ -97,9 +97,11 @@
     font-weight: bold;
 }
 
-.invoice tbody td:first-child {
-    max-width: 15em;
+.invoice tbody .description td:first-child {
+    padding: 0 1rem;
     white-space: pre-wrap;
+    text-align: justify;
+    hyphens: auto;
 }
 
 .invoice .legal {
diff --git a/web/template/invoices/view.gohtml b/web/template/invoices/view.gohtml
index 01b54cf..e6e78d3 100644
--- a/web/template/invoices/view.gohtml
+++ b/web/template/invoices/view.gohtml
@@ -78,17 +78,11 @@
                 {{ $lastIndex := len .Products | sub 1 }}
                 {{ range $index, $product := .Products -}}
                     <tbody>
-                    {{- if .Description }}
-                        <tr class="name">
-                            <td colspan="{{ $columns }}">{{ .Name }}</td>
-                        </tr>
-                    {{ end -}}
-                    <tr>
-                        {{- if .Description }}
-                            <td>{{ .Description }}</td>
-                        {{- else }}
-                            <td>{{ .Name }}</td>
-                        {{- end -}}
+                    <tr {{ if .Description -}}
+                        class="name"
+                    {{- end -}}
+                    >
+                        <td>{{ .Name }}</td>
                         <td class="numeric">{{ .Price | formatPrice }}</td>
                         {{ if $.HasDiscounts -}}
                             <td class="numeric">{{ $product.Discount | formatPercent }}</td>
@@ -100,6 +94,11 @@
                         {{ end -}}
                         <td class="numeric">{{ .Total | formatPrice }}</td>
                     </tr>
+                    {{- if .Description }}
+                        <tr class="description">
+                            <td colspan="{{ $columns }}">{{ .Description }}</td>
+                        </tr>
+                    {{ end -}}
                     {{ if (eq $index $lastIndex) }}
                         <tr class="tfoot separator">
                             <th scope="row" colspan="{{ $columns | sub 1 }}">{{( pgettext "Tax Base" "title" )}}</th>
diff --git a/web/template/quotes/view.gohtml b/web/template/quotes/view.gohtml
index d85382f..c0d94b2 100644
--- a/web/template/quotes/view.gohtml
+++ b/web/template/quotes/view.gohtml
@@ -82,17 +82,11 @@
                 {{ $lastIndex := len .Products | sub 1 }}
                 {{ range $index, $product := .Products -}}
                     <tbody>
-                    {{- if .Description }}
-                        <tr class="name">
-                            <td colspan="{{ $columns }}">{{ .Name }}</td>
-                        </tr>
-                    {{ end -}}
-                    <tr>
-                        {{- if .Description }}
-                            <td>{{ .Description }}</td>
-                        {{- else }}
-                            <td>{{ .Name }}</td>
-                        {{- end -}}
+                    <tr {{ if .Description -}}
+                        class="name"
+                    {{- end -}}
+                    >
+                        <td>{{ .Name }}</td>
                         <td class="numeric">{{ .Price | formatPrice }}</td>
                         {{ if $.HasDiscounts -}}
                             <td class="numeric">{{ $product.Discount | formatPercent }}</td>
@@ -104,6 +98,11 @@
                         {{ end -}}
                         <td class="numeric">{{ .Total | formatPrice }}</td>
                     </tr>
+                    {{- if .Description }}
+                        <tr class="description">
+                            <td colspan="{{ $columns }}">{{ .Description }}</td>
+                        </tr>
+                    {{- end }}
                     {{ if (eq $index $lastIndex) }}
                         <tr class="tfoot separator">
                             <th scope="row" colspan="{{ $columns | sub 1 }}">{{( pgettext "Tax Base" "title" )}}</th>