diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index a81bc6d5ee..b58b2686ce 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -386,24 +386,25 @@ function PMA_getRowDataForRegeneration($columnNumber, $submit_fulltext)
         ? $_REQUEST['field_null'][$columnNumber]
         : '';
 
-    if (isset($_REQUEST['field_key'][$columnNumber])
-        && $_REQUEST['field_key'][$columnNumber] == 'primary_' . $columnNumber
-    ) {
-        $columnMeta['Key'] = 'PRI';
-    } elseif (isset($_REQUEST['field_key'][$columnNumber])
-        && $_REQUEST['field_key'][$columnNumber] == 'index_' . $columnNumber
-    ) {
-        $columnMeta['Key'] = 'MUL';
-    } elseif (isset($_REQUEST['field_key'][$columnNumber])
-        && $_REQUEST['field_key'][$columnNumber] == 'unique_' . $columnNumber
-    ) {
-        $columnMeta['Key'] = 'UNI';
-    } elseif (isset($_REQUEST['field_key'][$columnNumber])
-        && $_REQUEST['field_key'][$columnNumber] == 'fulltext_' . $columnNumber
-    ) {
-        $columnMeta['Key'] = 'FULLTEXT';
-    } else {
-        $columnMeta['Key'] = '';
+    $columnMeta['Key'] = '';
+    if (isset($_REQUEST['field_key'][$columnNumber])) {
+        $parts = explode($_REQUEST['field_key'][$columnNumber], '_', 2);
+        if (count($parts) == 2 && $parts[1] == $columnNumber) {
+            switch ($parts[0]) {
+                case 'primary':
+                    $columnMeta['Key'] = 'PRI';
+                    break;
+                case 'index':
+                    $columnMeta['Key'] = 'MUL';
+                    break;
+                case 'unique':
+                    $columnMeta['Key'] = 'UNI';
+                    break;
+                case 'fulltext':
+                    $columnMeta['Key'] = 'FULLTEXT';
+                    break;
+            }
+        }
     }
 
     // put None in the drop-down for Default, when someone adds a field