diff --git a/ChangeLog b/ChangeLog
index 5f60d72fd..abc5da6fb 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2001-12-08  Loïc Chapeaux  <lolo@phpheaven.net>
+	* libraries/left.js, lines 234-240: fixed a js bug with empty databases.
+
 2001-12-07  Loïc Chapeaux  <lolo@phpheaven.net>
 	* lang/polish.inc.php3: fixed typos thanks to Tomasz Regdos & Jakub Wilk.
 	* tbl_indexes; tbl_printview.php3; tbl_properties.php3;
diff --git a/libraries/left.js b/libraries/left.js
index 4c8a0b9e2..7d1be1fdc 100644
--- a/libraries/left.js
+++ b/libraries/left.js
@@ -231,10 +231,13 @@ function hilightBase(el, theColor)
   if (typeof(whichDb.style) == 'undefined') {
     return;
   }
-  else {
+  else if (whichTables) {
     whichDb.style.backgroundColor     = theColor;
     whichTables.style.backgroundColor = theColor;
   }
+  else {
+    whichDb.style.backgroundColor     = theColor;
+  }
 
   return true;
 } // end of the 'hilightBase()' function