diff --git a/ChangeLog b/ChangeLog
index f427fae2f..538ce602d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,6 +63,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + [lang] Turkish update, thanks to Burak Yavuz
 + [lang] Galician update, thanks to Xosé Calvo
 + [lang] Brazilian-Portuguese update, thanks to Airon Luis Pereira
++ [gui] Insert/Edit: no longer display the Go button each 15 lines 
+  but just at the end of a row
 
 2.10.2.0 (not yet released)
 
diff --git a/tbl_change.php b/tbl_change.php
index d58c6aef5..8ef3b35ce 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -298,21 +298,6 @@ foreach ($loop_array as $vrowcount => $vrow) {
 
     $odd_row = true;
     for ($i = 0; $i < $fields_cnt; $i++) {
-        // Display the submit button after every 15 lines --swix
-        // (wanted to use an <a href="#bottom"> and <a name> instead,
-        // but it didn't worked because of the <base href>)
-
-        if ((($o_rows * $fields_cnt + $i) % 15 == 0) && ($i + $o_rows != 0)) {
-            ?>
-        <tr>
-            <th colspan="5" align="right" class="tblFooters">
-                <input type="submit" value="<?php echo $strGo; ?>" />&nbsp;
-            </th>
-        </tr>
-            <?php
-        } // end if
-        echo "\n";
-
         $row_table_def   = $trow_table_def[$i];
         $row_table_def['True_Type'] = preg_replace('@\(.*@s', '', $row_table_def['Type']);
 
@@ -961,6 +946,13 @@ foreach ($loop_array as $vrowcount => $vrow) {
         $odd_row = !$odd_row;
     } // end for
     $o_rows++;
+?>
+        <tr>
+            <th colspan="5" align="right" class="tblFooters">
+                <input type="submit" value="<?php echo $strGo; ?>" />&nbsp;
+            </th>
+        </tr>
+        <?php
     echo '  </table><br />';
 } // end foreach on multi-edit