diff --git a/libraries/classes/Config/FormDisplayTemplate.php b/libraries/classes/Config/FormDisplayTemplate.php
index 6f7bc03dfb..86d9b32a75 100644
--- a/libraries/classes/Config/FormDisplayTemplate.php
+++ b/libraries/classes/Config/FormDisplayTemplate.php
@@ -365,28 +365,25 @@ class FormDisplayTemplate
     /**
      * Display group header
      *
-     * @param string $header_text Text of header
+     * @param string $headerText Text of header
      *
      * @return string|void
      */
-    public static function displayGroupHeader($header_text)
+    public static function displayGroupHeader($headerText)
     {
         global $_FormDisplayGroup;
 
         $_FormDisplayGroup++;
-        if (! $header_text) {
+        if (! $headerText) {
             return null;
         }
-        $colspan = $GLOBALS['PMA_Config']->get('is_setup')
-            ? 3
-            : 2;
-        $htmlOutput = '<tr class="group-header group-header-' . $_FormDisplayGroup
-            . '">';
-        $htmlOutput .= '<th colspan="' . $colspan . '">';
-        $htmlOutput .= $header_text;
-        $htmlOutput .= '</th>';
-        $htmlOutput .= '</tr>';
-        return $htmlOutput;
+        $colspan = $GLOBALS['PMA_Config']->get('is_setup') ? 3 : 2;
+
+        return Template::get('config/form_display/group_header')->render([
+            'group' => $_FormDisplayGroup,
+            'colspan' => $colspan,
+            'header_text' => $headerText,
+        ]);
     }
 
     /**
diff --git a/templates/config/form_display/group_header.twig b/templates/config/form_display/group_header.twig
new file mode 100644
index 0000000000..47f1388f46
--- /dev/null
+++ b/templates/config/form_display/group_header.twig
@@ -0,0 +1,5 @@
+<tr class="group-header group-header-{{ group }}">
+    <th colspan="{{ colspan }}">
+        {{ header_text }}
+    </th>
+</tr>