diff --git a/ChangeLog b/ChangeLog
index 2a1da165a..a20674b9a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-08-23 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/display_tbl.lib.php: bug #1267177, wrong return page
+
 2005-08-23 Michal Čihař  <michal@cihar.com>
     * libraries/database_interface.lib.php: Abide cfg['Lang'] settings even if
       using MySQL > 4.1.x (bug #1266626).
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index d6cace586..d132107eb 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1095,10 +1095,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
 
             // 1.2.1 Modify link(s)
             if ($is_display['edit_lnk'] == 'ur') { // update row case
-                $lnk_goto = 'sql.php'
-                          . '?' . str_replace('&amp;', '&', $url_query)
-                          . '&sql_query=' . urlencode($sql_query)
-                          . '&goto=' . (empty($goto) ? 'tbl_properties.php' : $goto);
+                $lnk_goto = 'sql.php';
 
                 $edit_url = 'tbl_change.php'
                           . '?' . $url_query