diff --git a/libraries/classes/Controllers/Table/RelationController.php b/libraries/classes/Controllers/Table/RelationController.php
index 491fa1a486..93ff323a25 100644
--- a/libraries/classes/Controllers/Table/RelationController.php
+++ b/libraries/classes/Controllers/Table/RelationController.php
@@ -194,7 +194,7 @@ final class RelationController extends AbstractController
                 'dbi' => $this->dbi,
                 'default_sliders_state' => $GLOBALS['cfg']['InitialSlidersState'],
                 'foreignKeySupported' => $foreignKeySupported,
-                'displayIndexesHtml' => $foreignKeySupported ? Index::getHtmlForDisplayIndexes() : null,
+                'indexes_html' => $foreignKeySupported ? Index::getHtmlForIndexes($this->table, $this->db) : null,
                 'route' => $route,
             ])
         );
diff --git a/libraries/classes/Controllers/Table/StructureController.php b/libraries/classes/Controllers/Table/StructureController.php
index e273e89454..2d2911e81f 100644
--- a/libraries/classes/Controllers/Table/StructureController.php
+++ b/libraries/classes/Controllers/Table/StructureController.php
@@ -1331,7 +1331,7 @@ class StructureController extends AbstractController
             ],
             'collations' => $collations,
             'is_foreign_key_supported' => Util::isForeignKeySupported($engine),
-            'displayIndexesHtml' => Index::getHtmlForDisplayIndexes(),
+            'indexes_html' => Index::getHtmlForIndexes($this->table, $this->db),
             'cfg_relation' => $this->relation->getRelationsParam(),
             'hide_structure_actions' => $hideStructureActions,
             'db' => $this->db,
diff --git a/libraries/classes/Index.php b/libraries/classes/Index.php
index 4831a5e403..e151d22e98 100644
--- a/libraries/classes/Index.php
+++ b/libraries/classes/Index.php
@@ -561,40 +561,6 @@ class Index
         return $this->_columns;
     }
 
-    /**
-     * Get HTML for display indexes
-     *
-     * @return string
-     */
-    public static function getHtmlForDisplayIndexes()
-    {
-        $html_output = '<div id="index_div" class="w-100 ajax" >';
-        $html_output .= self::getHtmlForIndexes(
-            $GLOBALS['table'],
-            $GLOBALS['db']
-        );
-        $html_output .= '<fieldset class="tblFooters print_ignore" style="text-align: '
-            . 'left;"><form action="' . Url::getFromRoute('/table/indexes') . '" method="post">';
-        $html_output .= Url::getHiddenInputs(
-            $GLOBALS['db'],
-            $GLOBALS['table']
-        );
-        $html_output .= sprintf(
-            __('Create an index on &nbsp;%s&nbsp;columns'),
-            '<input type="number" name="added_fields" value="1" '
-            . 'min="1" required="required">'
-        );
-        $html_output .= '<input type="hidden" name="create_index" value="1">'
-            . '<input class="btn btn-primary add_index ajax"'
-            . ' type="submit" value="' . __('Go') . '">';
-
-        $html_output .= '</form>'
-            . '</fieldset>'
-            . '</div>';
-
-        return $html_output;
-    }
-
     /**
      * Show index data
      *
diff --git a/templates/table/relation/common_form.twig b/templates/table/relation/common_form.twig
index 9a51f165fc..3b27b66a7c 100644
--- a/templates/table/relation/common_form.twig
+++ b/templates/table/relation/common_form.twig
@@ -217,7 +217,24 @@
         <input class="btn btn-primary" type="submit" value="{% trans 'Save' %}">
     </fieldset>
 </form>
+
 {% if foreignKeySupported %}
-    {{ displayIndexesHtml|raw }}
+  <div id="index_div" class="w-100 ajax">
+    {{ indexes_html|raw }}
+
+    <fieldset class="tblFooters print_ignore text-left">
+      <form action="{{ url('/table/indexes') }}" method="post">
+        {{ get_hidden_inputs(db, table) }}
+        <input type="hidden" name="create_index" value="1">
+
+        {% apply format('<input class="mx-2" type="number" name="added_fields" value="1" min="1" required>')|raw %}
+          {% trans %}Create an index on %s columns{% endtrans %}
+        {% endapply %}
+
+        <input class="btn btn-primary add_index ajax" type="submit" value="{% trans 'Go' %}">
+      </form>
+    </fieldset>
+  </div>
 {% endif %}
+
 {% endblock %}
diff --git a/templates/table/structure/display_structure.twig b/templates/table/structure/display_structure.twig
index 45dbc9bc9d..045fde74c5 100644
--- a/templates/table/structure/display_structure.twig
+++ b/templates/table/structure/display_structure.twig
@@ -443,10 +443,23 @@
     </form>
 {% endif %}
 
-{# Displays indexes #}
-{% if not tbl_is_view and not db_is_system_schema
-    and 'ARCHIVE' !=  tbl_storage_engine %}
-    {{ displayIndexesHtml|raw }}
+{% if not tbl_is_view and not db_is_system_schema and tbl_storage_engine != 'ARCHIVE' %}
+  <div id="index_div" class="w-100 ajax">
+    {{ indexes_html|raw }}
+
+    <fieldset class="tblFooters print_ignore text-left">
+      <form action="{{ url('/table/indexes') }}" method="post">
+        {{ get_hidden_inputs(db, table) }}
+        <input type="hidden" name="create_index" value="1">
+
+        {% apply format('<input class="mx-2" type="number" name="added_fields" value="1" min="1" required>')|raw %}
+          {% trans %}Create an index on %s columns{% endtrans %}
+        {% endapply %}
+
+        <input class="btn btn-primary add_index ajax" type="submit" value="{% trans 'Go' %}">
+      </form>
+    </fieldset>
+  </div>
 {% endif %}
 
 {# Display partition details #}