diff --git a/ChangeLog b/ChangeLog
index eae43ec0a..0275dee08 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,12 +10,14 @@ $Source$
     * lang/spanish: update, thanks to Dr. med. Daniel Hinostroza C.
 
 2003-01-14 Michal Cihar  <nijel@users.sourceforge.net>
-    * tbl_properties_structure.php3,libraries/functions.js: Added (un)check
+    * tbl_properties_structure.php3, libraries/functions.js: Added (un)check
       all for fields selection.
-    * tbl_properties.inc.php3,libraries/functions.js: Merged patch #554439
+    * tbl_properties.inc.php3, libraries/functions.js: Merged patch #554439
       (Jumping cursor using keyboard).
-    * tbl_alter.php3: Always include functions.js to allow jumping using
-      keyboard.
+    * tbl_alter.php3, tbl_addfield.php3, tbl_create.php3: Always include
+      functions.js to allow jumping using keyboard.
+    * tbl_change.php3, libraries/tbl_change.js: Moving cursor with Ctrl+arrows
+      works also for row editing.
 
 2002-01-13 Robin Johnson  <robbat2@users.sourceforge.net>
     * libraries/sqlvalidator.class.php3:
diff --git a/libraries/functions.js b/libraries/functions.js
index 544b75150..3704cb19a 100644
--- a/libraries/functions.js
+++ b/libraries/functions.js
@@ -485,10 +485,10 @@ function setSelectOptions(the_form, the_select, do_check)
   * @param   object   event data   
   */
 function onKeyDownArrowsHandler(e) {
-    e=e||window.event;
+    e = e||window.event;
     var o = (e.srcElement||e.target);
     if (!o) return;
-    if (o.tagName != "INPUT" && o.tagName != "SELECT") return;
+    if (o.tagName != "TEXTAREA" && o.tagName != "INPUT" && o.tagName != "SELECT") return;
     if (!e.ctrlKey) return;
     if (!o.id) return;
 
@@ -496,17 +496,23 @@ function onKeyDownArrowsHandler(e) {
     if (pos[0] != "field" || typeof pos[2] == "undefined") return;
 
     var x = pos[2], y=pos[1];
+    
+    // skip non existent fields
+    for (i=0; i<10; i++)
+    {
+        switch(e.keyCode) {
+            case 38: y--; break; // up
+            case 40: y++; break; // down
+            case 37: x--; break; // left
+            case 39: x++; break; // right
+            default: return;
+        }
 
-    switch(e.keyCode) {
-        case 38: y--; break; // up
-        case 40: y++; break; // down
-        case 37: x--; break; // left
-        case 39: x++; break; // right
-        default: return;
+        var id = "field_" + y + "_" + x;
+        var nO = document.getElementById(id);
+        if (nO) break;
     }
-
-    var id = "field_" + y + "_" + x;
-    var nO = document.getElementById(id);
+    
     if (!nO) return;
     nO.focus();
     if (nO.tagName != 'SELECT') {
diff --git a/libraries/tbl_change.js b/libraries/tbl_change.js
index 959d10bb7..cc4798254 100644
--- a/libraries/tbl_change.js
+++ b/libraries/tbl_change.js
@@ -58,3 +58,45 @@ function unNullify(urlField)
 
     return true;
 } // end of the 'unNullify()' function
+
+/**
+  * Allows moving around inputs/select by Ctrl+arrows
+  *
+  * @param   object   event data   
+  */
+function onKeyDownArrowsHandler(e) {
+    e = e||window.event;
+    var o = (e.srcElement||e.target);
+    if (!o) return;
+    if (o.tagName != "TEXTAREA" && o.tagName != "INPUT" && o.tagName != "SELECT") return;
+    if (!e.ctrlKey) return;
+    if (!o.id) return;
+
+    var pos = o.id.split("_");
+    if (pos[0] != "field" || typeof pos[2] == "undefined") return;
+
+    var x = pos[2], y=pos[1];
+    
+    // skip non existent fields
+    for (i=0; i<10; i++)
+    {
+        switch(e.keyCode) {
+            case 38: y--; break; // up
+            case 40: y++; break; // down
+            case 37: x--; break; // left
+            case 39: x++; break; // right
+            default: return;
+        }
+
+        var id = "field_" + y + "_" + x;
+        var nO = document.getElementById(id);
+        if (nO) break;
+    }
+    
+    if (!nO) return;
+    nO.focus();
+    if (nO.tagName != 'SELECT') {
+        nO.select();
+    }
+    e.returnValue = false;
+}
diff --git a/tbl_change.php3 b/tbl_change.php3
index 1b3e4e79a..4d99bf5f4 100755
--- a/tbl_change.php3
+++ b/tbl_change.php3
@@ -140,6 +140,13 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
 // some browsers send wrongly this form to the http server.
 ?>
 
+<!-- Set on key handler for moving using by Ctrl+arrows -->
+<script type="text/javascript" language="javascript">
+<!--
+document.onkeydown = onKeyDownArrowsHandler;
+// -->
+</script>
+
 <!-- Change table properties form -->
 <form method="post" action="tbl_replace.php3" name="insertForm">
     <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
@@ -317,7 +324,7 @@ for ($i = 0; $i < $fields_cnt; $i++) {
         } else {
             ?>
         <td bgcolor="<?php echo $bgcolor; ?>">
-            <select name="funcs[<?php echo urlencode($field); ?>]" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo urlencode($field); ?>')" tabindex="<?php echo ($fields_cnt + $i + 1); ?>">
+            <select name="funcs[<?php echo urlencode($field); ?>]" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo urlencode($field); ?>')" tabindex="<?php echo ($fields_cnt + $i + 1); ?>" id="field_<?php echo $i; ?>_1">
                 <option></option>
             <?php
             echo "\n";
@@ -350,6 +357,7 @@ for ($i = 0; $i < $fields_cnt; $i++) {
         if ($data == 'NULL' && !$first_timestamp) {
             echo ' checked="checked"';
         }
+        echo ' id="field_' . $i . '_2"';
         $onclick         = ' onclick="if (this.checked) {nullify(';
         if (strstr($row_table_def['True_Type'], 'enum')) {
             if (strlen($row_table_def['Type']) > 20) {
@@ -380,8 +388,8 @@ for ($i = 0; $i < $fields_cnt; $i++) {
         ?>
         <td bgcolor="<?php echo $bgcolor; ?>">
         <?php echo $backup_field . "\n"; ?>
-        <input type="hidden" name="fields[<?php echo urlencode($field); ?>]" value="$foreign$" />
-        <select name="field_<?php echo md5($field); ?>[]" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo urlencode($field); ?>')" tabindex="<?php echo ($i + 1); ?>">
+        <input type="hidden" name="fields[<?php echo urlencode($field); ?>]" value="$foreign$" id="field_<?php echo $i; ?>_1" />
+        <select name="field_<?php echo md5($field); ?>[]" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo urlencode($field); ?>')" tabindex="<?php echo ($i + 1); ?>" id="field_<?php echo $i; ?>_2">
             <option value=""></option>
         <?php
         echo "\n";
@@ -402,7 +410,7 @@ for ($i = 0; $i < $fields_cnt; $i++) {
         ?>
         <td bgcolor="<?php echo $bgcolor; ?>">
             <?php echo $backup_field . "\n"; ?>
-            <textarea name="fields[<?php echo urlencode($field); ?>]" rows="<?php echo $cfg['TextareaRows']; ?>" cols="<?php echo $cfg['TextareaCols']; ?>" wrap="virtual" dir="<?php echo $text_dir; ?>"
+            <textarea name="fields[<?php echo urlencode($field); ?>]" rows="<?php echo $cfg['TextareaRows']; ?>" cols="<?php echo $cfg['TextareaCols']; ?>" wrap="virtual" dir="<?php echo $text_dir; ?>" id="field_<?php echo $i; ?>_2"
                 <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo urlencode($field); ?>')" tabindex="<?php echo ($i + 1); ?>"><?php echo $special_chars; ?></textarea>
         </td>
         <?php
@@ -426,7 +434,7 @@ for ($i = 0; $i < $fields_cnt; $i++) {
         if (strlen($row_table_def['Type']) > 20) {
             echo "\n";
             ?>
-            <select name="field_<?php echo md5($field); ?>[]" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo urlencode($field); ?>')" tabindex="<?php echo ($i + 1); ?>">
+            <select name="field_<?php echo md5($field); ?>[]" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo urlencode($field); ?>')" tabindex="<?php echo ($i + 1); ?>" id="field_<?php echo $i; ?>_2">
                 <option value=""></option>
             <?php
             echo "\n";
@@ -460,6 +468,7 @@ for ($i = 0; $i < $fields_cnt; $i++) {
                         && isset($row_table_def['Default']) && $enum_atom == $row_table_def['Default'])) {
                     echo ' checked="checked"';
                 }
+                echo ' id="field_' . $i . '_2"';
                 echo 'tabindex="' . ($i + 1) . '" />' . "\n";
                 echo '            <label for="radio_field_' . $j . '">' . htmlspecialchars($enum_atom) . '</label>' . "\n";
             } // end for
@@ -487,7 +496,7 @@ for ($i = 0; $i < $fields_cnt; $i++) {
         <td bgcolor="<?php echo $bgcolor; ?>">
             <?php echo $backup_field . "\n"; ?>
             <input type="hidden" name="fields[<?php echo urlencode($field); ?>]" value="$set$" />
-            <select name="field_<?php echo md5($field); ?>[]" size="<?php echo $size; ?>" multiple="multiple" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo urlencode($field); ?>')" tabindex="<?php echo ($i + 1); ?>" >
+            <select name="field_<?php echo md5($field); ?>[]" size="<?php echo $size; ?>" multiple="multiple" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo urlencode($field); ?>')" tabindex="<?php echo ($i + 1); ?>" id="field_<?php echo $i; ?>_2">
         <?php
         echo "\n";
         $countset = count($set);
@@ -523,7 +532,7 @@ for ($i = 0; $i < $fields_cnt; $i++) {
             ?>
         <td bgcolor="<?php echo $bgcolor; ?>">
             <?php echo $backup_field . "\n"; ?>
-            <textarea name="fields[<?php echo urlencode($field); ?>]" rows="<?php echo $cfg['TextareaRows']; ?>" cols="<?php echo $cfg['TextareaCols']; ?>" wrap="virtual" dir="<?php echo $text_dir; ?>"
+            <textarea name="fields[<?php echo urlencode($field); ?>]" rows="<?php echo $cfg['TextareaRows']; ?>" cols="<?php echo $cfg['TextareaCols']; ?>" wrap="virtual" dir="<?php echo $text_dir; ?>" id="field_<?php echo $i; ?>_2"
                 <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo urlencode($field); ?>')" tabindex="<?php echo ($i + 1); ?>" ><?php echo $special_chars; ?></textarea>
         </td>
             <?php
@@ -538,7 +547,7 @@ for ($i = 0; $i < $fields_cnt; $i++) {
             ?>
         <td bgcolor="<?php echo $bgcolor; ?>">
             <?php echo $backup_field . "\n"; ?>
-            <input type="text" name="fields[<?php echo urlencode($field); ?>]" value="<?php echo $special_chars; ?>" size="<?php echo $fieldsize; ?>" maxlength="<?php echo $maxlength; ?>" class="textfield" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo urlencode($field); ?>')" tabindex="<?php echo ($i + 1); ?>" />
+            <input type="text" name="fields[<?php echo urlencode($field); ?>]" value="<?php echo $special_chars; ?>" size="<?php echo $fieldsize; ?>" maxlength="<?php echo $maxlength; ?>" class="textfield" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo urlencode($field); ?>')" tabindex="<?php echo ($i + 1); ?>" id="field_<?php echo $i; ?>_2" />
         </td>
             <?php
         } // end if...elseif...else
@@ -563,13 +572,13 @@ for ($i = 0; $i < $fields_cnt; $i++) {
         if ($is_char && isset($cfg['CharEditing']) && ($cfg['CharEditing'] == 'textarea')) {
             echo "\n";
             ?>
-            <textarea name="fields[<?php echo urlencode($field); ?>]" rows="<?php echo $cfg['CharTextareaRows']; ?>" cols="<?php echo $cfg['CharTextareaCols']; ?>" wrap="virtual" dir="<?php echo $text_dir; ?>"
+            <textarea name="fields[<?php echo urlencode($field); ?>]" rows="<?php echo $cfg['CharTextareaRows']; ?>" cols="<?php echo $cfg['CharTextareaCols']; ?>" wrap="virtual" dir="<?php echo $text_dir; ?>" id="field_<?php echo $i; ?>_2"
                 <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo urlencode($field); ?>')" tabindex="<?php echo ($i + 1); ?>" ><?php echo $special_chars; ?></textarea>
             <?php
         } else {
             echo "\n";
             ?>
-            <input type="text" name="fields[<?php echo urlencode($field); ?>]" value="<?php echo $special_chars; ?>" size="<?php echo $fieldsize; ?>" maxlength="<?php echo $maxlength; ?>" class="textfield" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo urlencode($field); ?>')" tabindex="<?php echo ($i + 1); ?>" />
+            <input type="text" name="fields[<?php echo urlencode($field); ?>]" value="<?php echo $special_chars; ?>" size="<?php echo $fieldsize; ?>" maxlength="<?php echo $maxlength; ?>" class="textfield" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo urlencode($field); ?>')" tabindex="<?php echo ($i + 1); ?>" id="field_<?php echo $i; ?>_2" />
             <?php
         }
         echo "\n";