diff --git a/ChangeLog b/ChangeLog
index 7094d6eaf..3b41e329e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ $Source$
     * libraries/common.lib.php: Group databases by rightmost separator (bug
       #1325651).
     * libraries/string.lib.php: Fix escaping detection on multi byte strings.
+    * libraries/sql_query_form.lib.php: No warning if no db defined.
 
 2005-10-17 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * css/phpmyadmin.css.php: border around tabs bug #1326730
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index b80905b83..257d2acca 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -376,8 +376,7 @@ function PMA_sqlQueryFormInsert( $query = '', $is_querywindow = false ) {
  * @uses    htmlspecialchars()
  */
 function PMA_sqlQueryFormBookmark() {
-    $bookmark_list = PMA_listBookmarks( 
-        $GLOBALS['db'], $GLOBALS['cfg']['Bookmark'] );
+    $bookmark_list = PMA_listBookmarks(isset($GLOBALS['db']) ? $GLOBALS['db'] : '', $GLOBALS['cfg']['Bookmark'] );
     if ( ! $bookmark_list || count( $bookmark_list ) < 1 ) {
         return;
     }