diff --git a/src/opnsense/mvc/app/views/layout_partials/base_dialog.volt b/src/opnsense/mvc/app/views/layout_partials/base_dialog.volt
index f6e343a64..9f699aabc 100644
--- a/src/opnsense/mvc/app/views/layout_partials/base_dialog.volt
+++ b/src/opnsense/mvc/app/views/layout_partials/base_dialog.volt
@@ -34,28 +34,6 @@ label           :   dialog label
 
 #}
 
-{# close table and reopen for new header#}
-{%- macro base_dialog_header(header_text) %}
-      </tbody>
-    </table>
-  </div>
-  <div class="table-responsive">
-    <table class="table table-striped table-condensed">
-        <colgroup>
-            <col class="col-md-3"/>
-            <col class="col-md-{{ 12-3-msgzone_width|default(5) }}"/>
-            <col class="col-md-{{ msgzone_width|default(5) }}"/>
-        </colgroup>
-        <thead>
-          <tr colspan="3">
-            <th><h2>{{header_text}}</h2></th>
-          </tr>
-        </thead>
-        <tbody>
-{%- endmacro %}
-
-
-
 {# Find if there are help supported or advanced field on this page #}
 {% set help=false %}
 {% set advanced=false %}
@@ -101,7 +79,22 @@ label           :   dialog label
                         {% for field in fields|default({})%}
                             {% if field['type'] == 'header' %}
                               {# close table and start new one with header #}
-                              {{ base_dialog_header(field['label']) }}
+                        </tbody>
+                    </table>
+                  </div>
+                  <div class="table-responsive">
+                    <table class="table table-striped table-condensed">
+                        <colgroup>
+                            <col class="col-md-3"/>
+                            <col class="col-md-{{ 12-3-msgzone_width|default(5) }}"/>
+                            <col class="col-md-{{ msgzone_width|default(5) }}"/>
+                        </colgroup>
+                        <thead>
+                          <tr colspan="3">
+                            <th><h2>{{field['label']}}</h2></th>
+                          </tr>
+                        </thead>
+                        <tbody>
                             {% else %}
                               {{ partial("layout_partials/form_input_tr",field)}}
                             {% endif %}