diff --git a/ChangeLog b/ChangeLog
index c5b705a97..a26f54632 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1990342 [import] SQL file import very slow on Windows,
   thanks to Richard Heaton - wotnot
 - bug [XHTML] problem with tabindex and radio fields
+- bug #1971221 [interface] tabindex not set correctly 
 
 2.11.7.0 (not yet released)
 - bug #1908719 [interface] New field cannot be auto-increment and primary key 
diff --git a/tbl_change.php b/tbl_change.php
index d8e052f2f..d802e2ad3 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -235,8 +235,8 @@ while ($trow = PMA_DBI_fetch_assoc($table_def)) {
 }
 
 $tabindex = 0;
-$tabindex_for_function = +1000;
-$tabindex_for_null     = +2000;
+$tabindex_for_function = +3000;
+$tabindex_for_null     = +6000;
 $tabindex_for_value    = 0;
 $o_rows   = 0;
 $biggest_max_file_size = 0;