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 c44eb36ca..62026f52d 100644
--- a/src/opnsense/mvc/app/views/layout_partials/base_dialog.volt
+++ b/src/opnsense/mvc/app/views/layout_partials/base_dialog.volt
@@ -34,6 +34,25 @@ label           :   dialog label
 
 #}
 
+{%- 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 %}
+
 {# Volt templates in php7 have issues with scope sometimes, copy input values to make them more unique #}
 {% set base_dialog_id=id %}
 {% set base_dialog_fields=fields %}
@@ -86,22 +105,7 @@ label           :   dialog label
                             {% set help=false %}
                             {% if field['type'] == 'header' %}
                               {# close table and start new one with header #}
-                        </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>
+                              {{ base_dialog_header(field['label']) }}
                             {% else %}
                               {{ partial("layout_partials/form_input_tr",field)}}
                             {% endif %}