diff --git a/InvenTree/order/templates/order/order_wizard/match_parts.html b/InvenTree/order/templates/order/order_wizard/match_parts.html
index e6cb565a5b..aa9776085f 100644
--- a/InvenTree/order/templates/order/order_wizard/match_parts.html
+++ b/InvenTree/order/templates/order/order_wizard/match_parts.html
@@ -63,16 +63,16 @@
                 {% for item in row.data %}
                 <td>
                     {% if item.column.guess == 'Quantity' %}
-                    {% for field in form.visible_fields %}
-                        {% if field.name == row.quantity_select %}
-                            {{ field }}
+                        {% for field in form.visible_fields %}
+                            {% if field.name == row.quantity_select %}
+                                {{ field }}
+                            {% endif %}
+                        {% endfor %}
+                        {% if row.errors.quantity %}
+                            <p class='help-inline'>{{ row.errors.quantity }}</p>
                         {% endif %}
-                    {% endfor %}
-                    {% if row.errors.quantity %}
-                    <p class='help-inline'>{{ row.errors.quantity }}</p>
-                    {% endif %}
                     {% else %}
-                    {{ item.cell }}
+                        {{ item.cell }}
                     {% endif %}
                     <input type='hidden' name='row_{{ row.index }}_col_{{ forloop.counter0 }}' value='{{ item.cell }}'/>
                 </td>