diff --git a/ChangeLog b/ChangeLog
index 5aef394ac..67da9e460 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-08-14 Marc Delisle  <lem9@users.sourceforge.net>
+    * tbl_change.php: $goto was not encoded in the form, resulting in a
+      problem after editing/saving a row (seen in IE6)
+
 2005-08-12 Marc Delisle  <lem9@users.sourceforge.net>
     * header.inc.php: remove the 'InnoDB free' segment from table comments
     * footer.inc.php: bug #1257106, display problem in the left frame (IE)
diff --git a/tbl_change.php b/tbl_change.php
index 4dfd6c90b..bdc962c2c 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -174,7 +174,7 @@ document.onkeydown = onKeyDownArrowsHandler;
 <!-- Change table properties form -->
 <form method="post" action="tbl_replace.php" name="insertForm" <?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?>>
     <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
-    <input type="hidden" name="goto" value="<?php echo $goto; ?>" />
+    <input type="hidden" name="goto" value="<?php echo urlencode($goto); ?>" />
     <input type="hidden" name="pos" value="<?php echo isset($pos) ? $pos : 0; ?>" />
     <input type="hidden" name="session_max_rows" value="<?php echo isset($session_max_rows) ? $session_max_rows : ''; ?>" />
     <input type="hidden" name="disp_direction" value="<?php echo isset($disp_direction) ? $disp_direction : ''; ?>" />