diff --git a/templates/columns_definitions/column_attributes.twig b/templates/columns_definitions/column_attributes.twig
index 29df37556a..e28af4c59a 100644
--- a/templates/columns_definitions/column_attributes.twig
+++ b/templates/columns_definitions/column_attributes.twig
@@ -102,13 +102,30 @@
 {% if not is_backup %}
     {# column indexes, See my other comment about  this 'if'. #}
     <td class="text-center">
-        {% include 'columns_definitions/column_indexes.twig' with {
-            'column_number': column_number,
-            'ci': ci,
-            'ci_offset': ci_offset,
-            'column_meta': column_meta
-        } only %}
-        {% set ci = ci + 1 %}
+      <select name="field_key[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" data-index="">
+        <option value="none_{{ column_number }}">---</option>
+        <option value="primary_{{ column_number }}" title="{% trans "Primary" %}"
+          {{- column_meta['Key'] is defined and column_meta['Key'] == 'PRI' ? ' selected' }}>
+          PRIMARY
+        </option>
+        <option value="unique_{{ column_number }}" title="{% trans "Unique" %}"
+          {{- column_meta['Key'] is defined and column_meta['Key'] == 'UNI' ? ' selected' }}>
+          UNIQUE
+        </option>
+        <option value="index_{{ column_number }}" title="{% trans "Index" %}"
+          {{- column_meta['Key'] is defined and column_meta['Key'] == 'MUL' ? ' selected' }}>
+          INDEX
+        </option>
+        <option value="fulltext_{{ column_number }}" title="{% trans "Fulltext" %}"
+          {{- column_meta['Key'] is defined and column_meta['Key'] == 'FULLTEXT' ? ' selected' }}>
+          FULLTEXT
+        </option>
+        <option value="spatial_{{ column_number }}" title="{% trans "Spatial" %}"
+          {{- column_meta['Key'] is defined and column_meta['Key'] == 'SPATIAL' ? ' selected' }}>
+          SPATIAL
+        </option>
+      </select>
+      {% set ci = ci + 1 %}
     </td>
 {% endif %}
 <td class="text-center">
diff --git a/templates/columns_definitions/column_indexes.twig b/templates/columns_definitions/column_indexes.twig
deleted file mode 100644
index 398022997a..0000000000
--- a/templates/columns_definitions/column_indexes.twig
+++ /dev/null
@@ -1,24 +0,0 @@
-<select name="field_key[{{ column_number }}]"
-    id="field_{{ column_number }}_{{ ci - ci_offset }}" data-index="">
-    <option value="none_{{ column_number }}">---</option>
-    <option value="primary_{{ column_number }}" title="{% trans "Primary" %}"
-        {{- column_meta['Key'] is defined and column_meta['Key'] == 'PRI' ? ' selected="selected"' }}>
-        PRIMARY
-    </option>
-    <option value="unique_{{ column_number }}" title="{% trans "Unique" %}"
-        {{- column_meta['Key'] is defined and column_meta['Key'] == 'UNI' ? ' selected="selected"' }}>
-        UNIQUE
-    </option>
-    <option value="index_{{ column_number }}" title="{% trans "Index" %}"
-        {{- column_meta['Key'] is defined and column_meta['Key'] == 'MUL' ? ' selected="selected"' }}>
-        INDEX
-    </option>
-    <option value="fulltext_{{ column_number }}" title="{% trans "Fulltext" %}"
-        {{- column_meta['Key'] is defined and column_meta['Key'] == 'FULLTEXT' ? ' selected="selected"' }}>
-        FULLTEXT
-    </option>
-    <option value="spatial_{{ column_number }}" title="{% trans "Spatial" %}"
-        {{- column_meta['Key'] is defined and column_meta['Key'] == 'SPATIAL' ? ' selected="selected"' }}>
-        SPATIAL
-    </option>
-</select>