diff --git a/ChangeLog b/ChangeLog
index 2af662f35..4a3ec109c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ $Source$
 
 2002-11-25 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_properties_structure.php3: wrong back link in case of errors
+    * sql.php3: undefined variable $sql_query when adding a bookmark
 
 2002-11-23 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/display_tbl.lib.php3: clicking on a COUNT() column to sort
diff --git a/sql.php3 b/sql.php3
index 704dd7129..b7f11acef 100755
--- a/sql.php3
+++ b/sql.php3
@@ -34,6 +34,11 @@ if (!isset($err_url)) {
              . ((strpos(' ' . $goto, 'db_details') != 1 && isset($table)) ? '&amp;table=' . urlencode($table) : '');
 } // end if
 
+// Coming from a bookmark dialog
+if (isset($fields['query'])) {
+    $sql_query = $fields['query'];
+}
+
 /**
  * Check rights in case of DROP DATABASE
  *