diff --git a/templates/columns_definitions/column_attributes.twig b/templates/columns_definitions/column_attributes.twig
index ae57f9e901..71fd8c2f78 100644
--- a/templates/columns_definitions/column_attributes.twig
+++ b/templates/columns_definitions/column_attributes.twig
@@ -25,15 +25,12 @@
   {% set ci = ci + 1 %}
 </td>
 <td class="text-center">
-    {# column length #}
-    {% include 'columns_definitions/column_length.twig' with {
-        'column_number': column_number,
-        'ci': ci,
-        'ci_offset': ci_offset,
-        'length_values_input_size': length_values_input_size,
-        'length_to_display': length
-    } only %}
-    {% set ci = ci + 1 %}
+  <input id="field_{{ column_number }}_{{ ci - ci_offset }}" type="text" name="field_length[{{ column_number }}]" size="
+    {{- length_values_input_size }}" value="{{ length }}" class="textfield">
+  <p class="enum_notice" id="enum_notice_{{ column_number }}_{{ ci - ci_offset }}">
+    <a href="#" class="open_enum_editor">{% trans 'Edit ENUM/SET values' %}</a>
+  </p>
+  {% set ci = ci + 1 %}
 </td>
 <td class="text-center">
     {# column default #}
diff --git a/templates/columns_definitions/column_length.twig b/templates/columns_definitions/column_length.twig
deleted file mode 100644
index ef7e5f0654..0000000000
--- a/templates/columns_definitions/column_length.twig
+++ /dev/null
@@ -1,11 +0,0 @@
-<input id="field_{{ column_number }}_{{ ci - ci_offset }}"
-    type="text"
-    name="field_length[{{ column_number }}]"
-    size="{{ length_values_input_size }}"
-    value="{{ length_to_display }}"
-    class="textfield">
-<p class="enum_notice" id="enum_notice_{{ column_number }}_{{ ci - ci_offset }}">
-    <a href="#" class="open_enum_editor">
-        {% trans 'Edit ENUM/SET values' %}
-    </a>
-</p>
diff --git a/templates/database/central_columns/edit_table_row.twig b/templates/database/central_columns/edit_table_row.twig
index 9a79281456..82731975d7 100644
--- a/templates/database/central_columns/edit_table_row.twig
+++ b/templates/database/central_columns/edit_table_row.twig
@@ -18,13 +18,10 @@
   </td>
 
   <td class="nowrap" name="col_length">
-    {% include 'columns_definitions/column_length.twig' with {
-      'column_number': row_num,
-      'ci': 2,
-      'ci_offset': 0,
-      'length_values_input_size': 8,
-      'length_to_display': row['col_length']
-    } only %}
+    <input id="field_{{ row_num }}_2" type="text" name="field_length[{{ row_num }}]" size="8" value="{{ row['col_length'] }}" class="textfield">
+    <p class="enum_notice" id="enum_notice_{{ row_num }}_2">
+      <a href="#" class="open_enum_editor">{% trans 'Edit ENUM/SET values' %}</a>
+    </p>
   </td>
 
   <td class="nowrap" name="col_default">
diff --git a/templates/database/central_columns/main.twig b/templates/database/central_columns/main.twig
index 2670eff8de..f2495091e2 100644
--- a/templates/database/central_columns/main.twig
+++ b/templates/database/central_columns/main.twig
@@ -68,13 +68,10 @@
                           </select>
                         </td>
                         <td class="nowrap" name="col_length">
-                            {% include 'columns_definitions/column_length.twig' with {
-                                'column_number': 0,
-                                'ci': 2,
-                                'ci_offset': 0,
-                                'length_values_input_size': 8,
-                                'length_to_display': ''
-                            } only %}
+                          <input id="field_0_2" type="text" name="field_length[0]" size="8" value="" class="textfield">
+                          <p class="enum_notice" id="enum_notice_0_2">
+                            <a href="#" class="open_enum_editor">{% trans 'Edit ENUM/SET values' %}</a>
+                          </p>
                         </td>
                         <td class="nowrap" name="col_default">
                             {% include 'columns_definitions/column_default.twig' with {
@@ -301,14 +298,11 @@
                               </select>
                             </td>
                             <td class="nowrap" name="col_length">
-                                <span>{{ (row['col_length']?(row['col_length']):'') }}</span>
-                                {% include 'columns_definitions/column_length.twig' with {
-                                    'column_number': row_num,
-                                    'ci': 2,
-                                    'ci_offset': 0,
-                                    'length_values_input_size': 8,
-                                    'length_to_display': row['col_length']
-                                } only %}
+                              <span>{{ (row['col_length']?(row['col_length']):'') }}</span>
+                              <input id="field_{{ row_num }}_2" type="text" name="field_length[{{ row_num }}]" size="8" value="{{ row['col_length'] }}" class="textfield">
+                              <p class="enum_notice" id="enum_notice_{{ row_num }}_2">
+                                <a href="#" class="open_enum_editor">{% trans 'Edit ENUM/SET values' %}</a>
+                              </p>
                             </td>
                             <td class="nowrap" name="col_default">
                                 {% if row['col_default'] is defined %}