diff --git a/mayan/apps/main/templates/main/generic_form_instance.html b/mayan/apps/main/templates/main/generic_form_instance.html
index 1e48abe0af..8e88e85fae 100644
--- a/mayan/apps/main/templates/main/generic_form_instance.html
+++ b/mayan/apps/main/templates/main/generic_form_instance.html
@@ -17,16 +17,26 @@
{% endif %}
{% if form_display_mode_table %}
+
+ {% for field in form.visible_fields %}
+ {% for error in field.errors %}
+
+ {% endfor %}
+ {% endfor %}
+
+
{% for field in form.hidden_fields %}
{{ field }}
{% endfor %}
{% for field in form.visible_fields %}
-
- {% if field.errors %}{% endif %}
+
+ {% if field.errors %} {% endif %}
{{ field }}
- {% if field.errors %} {% endif %}
- |
+ {% if field.errors %} {% endif %}
+ |
{% endfor %}
{% else %}