diff --git a/ChangeLog b/ChangeLog
index f1bdac0b11..bac870c38d 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-02-04 Marc Delisle  <lem9@users.sourceforge.net>
+	* tbl_replace.php3, better correction for bug 508024
+
 2002-02-04  Olivier Müller  <om@omnis.ch>
 	* left.php3: small cosmetic fixe in lightmode
 
diff --git a/tbl_replace.php3 b/tbl_replace.php3
index fb9a7e2295..c6c4190375 100755
--- a/tbl_replace.php3
+++ b/tbl_replace.php3
@@ -27,7 +27,8 @@ if (isset($after_insert) && $after_insert == 'new_insert') {
           . '&disp_direction=' . $disp_direction
           . '&repeat_cells=' . $repeat_cells
           . (empty($sql_query) ? '' : '&sql_query=' . urlencode($sql_query));
-} else  /* if ($goto == 'sql.php3') */  {
+} else  if ($goto == 'sql.php3' 
+           or ($goto == 'tbl_properties.php3' and !empty($sql_query)))  {
     $goto = 'sql.php3?'
           . 'lang=' . $lang
           . '&server=' . $server