diff --git a/js/src/functions.js b/js/src/functions.js
index 7d0e798b70..82873e06c8 100644
--- a/js/src/functions.js
+++ b/js/src/functions.js
@@ -3341,8 +3341,7 @@ AJAX.registerOnload('functions.js', function () {
  */
 Functions.hideShowConnection = function ($engineSelector) {
     var $connection = $('.create_table_form input[name=connection]');
-    var index = $connection.parent('td').index();
-    var $labelTh = $connection.parents('tr').prev('tr').children('th').eq(index);
+    var $labelTh = $('.create_table_form #storage-engine-connection');
     if ($engineSelector.val() !== 'FEDERATED') {
         $connection
             .prop('disabled', true)
diff --git a/templates/columns_definitions/column_definitions_form.twig b/templates/columns_definitions/column_definitions_form.twig
index 480e167897..916a1ead42 100644
--- a/templates/columns_definitions/column_definitions_form.twig
+++ b/templates/columns_definitions/column_definitions_form.twig
@@ -78,7 +78,7 @@
                     {{ show_mysql_docu('Storage_engines') }}
                 </th>
                 <td width="25">&nbsp;</td>
-                <th>
+                <th id="storage-engine-connection">
                     {% trans 'Connection:' %}
                     {{ show_mysql_docu('federated-create-connection') }}
                 </th>