diff --git a/ChangeLog b/ChangeLog
index 2c00ad7c2..f8ac780f8 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@ $Source$
     * libraries/function.js, css/phpmyadmin.css.php:
       added mark and hover effect to every table of class data
     * libraries/sql_query_form.lib.php: open db link from querywindow in main frame
+    * footer.inc.php, header.inc.php, libraries/tooltip.js:
+      moved tooltip javascript include into header
     
 2005-10-18 Michal Čihař  <michal@cihar.com>
     * libraries/relation.lib.php: Do not set database if not needed.
diff --git a/footer.inc.php b/footer.inc.php
index 5d4e8fe13..3a7dc3c83 100644
--- a/footer.inc.php
+++ b/footer.inc.php
@@ -77,8 +77,6 @@ if (isset($GLOBALS['userlink']) && $GLOBALS['userlink']) {
 
 include('./config.footer.inc.php');
 ?>
-    <script src="libraries/tooltip.js" type="text/javascript"
-        language="javascript"></script>
 </body>
 </html>
 <?php
diff --git a/header.inc.php b/header.inc.php
index 566dcc044..77c81c88e 100644
--- a/header.inc.php
+++ b/header.inc.php
@@ -129,6 +129,8 @@ if (empty($GLOBALS['is_header_sent'])) {
     // Reloads the navigation frame via JavaScript if required
     PMA_reloadNavigation();
     ?>
+        <script src="libraries/tooltip.js" type="text/javascript"
+            language="javascript"></script>
         <meta name="OBGZip" content="<?php echo ($cfg['OBGzip'] ? 'true' : 'false'); ?>" />
     </head>
 
diff --git a/libraries/tooltip.js b/libraries/tooltip.js
index accefd144..1d04be9af 100644
--- a/libraries/tooltip.js
+++ b/libraries/tooltip.js
@@ -18,15 +18,9 @@ if (ttDOM) { // if DOM-compatible, set the others to false
     ttIE4 = 0;
 }
 
+var myTooltipContainer = null;
+
 if ( (ttDOM) || (ttIE4) || (ttNS4) ) {
-    // reference to TooltipContainer
-    if (ttNS4) {
-        var myTooltipContainer = document.TooltipContainer;
-    } else if (ttIE4) {
-        var myTooltipContainer = document.all('TooltipContainer');
-    } else if (ttDOM) {
-        var myTooltipContainer = document.getElementById('TooltipContainer');
-    }
     // mouse-event
     if ( ttNS4 ) {
         document.captureEvents(Event.MOUSEMOVE);
@@ -134,6 +128,19 @@ function moveTooltip(posX, posY) {
  * @param    string    theText    tooltip content
  */
 function pmaTooltip(theText) {
+    // reference to TooltipContainer
+    if ( null == myTooltipContainer ) {
+        if (ttNS4) {
+            myTooltipContainer = document.TooltipContainer;
+        } else if (ttIE4) {
+            myTooltipContainer = document.all('TooltipContainer');
+        } else if (ttDOM) {
+            myTooltipContainer = document.getElementById('TooltipContainer');
+        } else {
+            return false;
+        }
+    }
+    
     var plusX=0, plusY=0, docX=0; docY=0;
     var divHeight = myTooltipContainer.clientHeight;
     var divWidth  = myTooltipContainer.clientWidth;