diff --git a/ChangeLog b/ChangeLog
index 7f158a8bd..4e9d94eda 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-10-06 Michal Cihar  <nijel@users.sourceforge.net>
+    * tbl_replace.php3: Do not include query in redirect url if too long.
+
 2003-10-02 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/grab_globals.lib.php3: bug 807047, protect POST variables
       against cookies of the same name
diff --git a/tbl_replace.php3 b/tbl_replace.php3
index 26280a5f6..92fecb93d 100755
--- a/tbl_replace.php3
+++ b/tbl_replace.php3
@@ -204,7 +204,8 @@ if (!$result) {
         // if we have seen binary,
         // we do not append the query to the Location so it won't be displayed
         // on the resulting page
-        $add_query = (!$seen_binary ? '&disp_query=' . urlencode($sql_query) : '');
+        // Nijel: we also need to limit size of url...
+        $add_query = (!$seen_binary && strlen($sql_query) < 1024 ? '&disp_query=' . urlencode($sql_query) : '');
         header('Location: ' . $cfg['PmaAbsoluteUri'] . $goto . '&disp_message=' . urlencode($message) . $add_query);
     }
     exit();