diff --git a/libraries/classes/Controllers/Table/TableStructureController.php b/libraries/classes/Controllers/Table/TableStructureController.php
index 13a1ae6fa5..f6380266b7 100644
--- a/libraries/classes/Controllers/Table/TableStructureController.php
+++ b/libraries/classes/Controllers/Table/TableStructureController.php
@@ -537,7 +537,7 @@ class TableStructureController extends TableController
                     array(
                         'db' => $this->db,
                         'table' => $this->table,
-                        'partitionDetails' => $partitionDetails
+                        'partition_details' => $partitionDetails,
                     )
                 )
         );
diff --git a/templates/table/structure/partition_definition_form.phtml b/templates/table/structure/partition_definition_form.phtml
deleted file mode 100644
index 094e03ea20..0000000000
--- a/templates/table/structure/partition_definition_form.phtml
+++ /dev/null
@@ -1,13 +0,0 @@
-<form action="tbl_structure.php" method="post">
-    <?= PhpMyAdmin\Url::getHiddenInputs($db, $table); ?>
-    <input type="hidden" name="edit_partitioning" value="true" />
-
-    <fieldset>
-        <legend><?= __('Edit partitioning'); ?></legend>
-        <?= PhpMyAdmin\Template::get('columns_definitions/partitions')
-            ->render(array('partition_details' => $partitionDetails)); ?>
-    </fieldset>
-    <fieldset class="tblFooters">
-        <input type="submit" name="save_partitioning" value="<?= __('Save'); ?>">
-    </fieldset>
-</form>
diff --git a/templates/table/structure/partition_definition_form.twig b/templates/table/structure/partition_definition_form.twig
new file mode 100644
index 0000000000..186a6c71f1
--- /dev/null
+++ b/templates/table/structure/partition_definition_form.twig
@@ -0,0 +1,14 @@
+<form action="tbl_structure.php" method="post">
+    {{ Url_getHiddenInputs(db, table) }}
+    <input type="hidden" name="edit_partitioning" value="true" />
+
+    <fieldset>
+        <legend>{% trans 'Edit partitioning' %}</legend>
+        {% include 'columns_definitions/partitions.twig' with {
+            'partition_details': partition_details
+        } only %}
+    </fieldset>
+    <fieldset class="tblFooters">
+        <input type="submit" name="save_partitioning" value="{% trans 'Save' %}">
+    </fieldset>
+</form>