diff --git a/ChangeLog b/ChangeLog
index 3fdf3eb76..a36ff877c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -69,6 +69,7 @@ danbarry
 - 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 90064f4e2..a5d2e7c95 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -241,8 +241,8 @@ $timestamp_seen = 0;
 $fields_cnt     = count($table_fields);
 
 $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;