diff --git a/ChangeLog b/ChangeLog
index cf91294f46..339bcf2d19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,7 @@ phpMyAdmin - ChangeLog
 - bug #4054 query analysis doesn't launch in status monitor
 + Add pmahomme icon credits (FamFamFam silk icon set)
 - bug #4064 Table structure statistics "Space usage" caption too small for l10n
+- bug #4051 Wrong tabindex when inserting rows
 
 4.0.5.0 (2013-08-04)
 - bug #3977 Not detected configuration storage
diff --git a/js/tbl_change.js b/js/tbl_change.js
index ef73dacd38..a0cac719e6 100644
--- a/js/tbl_change.js
+++ b/js/tbl_change.js
@@ -477,14 +477,14 @@ AJAX.registerOnload('tbl_change.js', function () {
             // IMO it's not really important to handle the tabindex for
             // function and Null
             var tabindex = 0;
-            $('.textfield')
+            $('.textfield, .char')
             .each(function () {
                 tabindex++;
                 $(this).attr('tabindex', tabindex);
                 // update the IDs of textfields to ensure that they are unique
                 $(this).attr('id', "field_" + tabindex + "_3");
             });
-            $('select.control_at_footer')
+            $('.control_at_footer')
             .each(function () {
                 tabindex++;
                 $(this).attr('tabindex', tabindex);
diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
index a8fed9e9e3..6faafb52fe 100644
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@@ -1527,7 +1527,7 @@ function PMA_getSubmitTypeDropDown($where_clause, $tabindex, $tabindex_for_value
  */
 function PMA_getAfterInsertDropDown($where_clause, $after_insert, $found_unique_key)
 {
-    $html_output = '<select name="after_insert">'
+    $html_output = '<select name="after_insert" class="control_at_footer">'
         . '<option value="back" '
         . ($after_insert == 'back' ? 'selected="selected"' : '') . '>'
         . __('Go back to previous page') . '</option>'