diff --git a/ChangeLog b/ChangeLog
index a4fa49cd9..c48220947 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,8 @@ $Id$
 $Source$
 
 2005-09-27 Sebastian Mendel <cybot_tm@users.sourceforge.net>
-    * libraries/sql_query_form.lib.php: removed unneeded variable
+    * libraries/sql_query_form.lib.php: removed unneeded variable,
+      dont display bookmark selection fieldset if no bookmark exists
 
 2005-09-27 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/sql_query_form.lib.php, db_details.php, server_sql.php
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 5626b39be..5aa3ad149 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -374,7 +374,7 @@ function PMA_sqlQueryFormInsert( $query = '', $is_querywindow = false ) {
 function PMA_sqlQueryFormBookmark() {
     $bookmark_list = PMA_listBookmarks( 
         $GLOBALS['db'], $GLOBALS['cfg']['Bookmark'] );
-    if ( count( $bookmark_list ) < 1 ) {
+    if ( ! $bookmark_list || count( $bookmark_list ) < 1 ) {
         return;
     }