diff --git a/ChangeLog b/ChangeLog
index 8d6ea8642..87959f489 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@ $Source$
       detection to only place where it is currently used.
     * header.inc.php, css/phpmyadmin.css.php: Define CSS normal way and not
       by writing through JavaScript.
+    * footer.inc.php, header.inc.php: Include JavaScript in header and not in
+      footer.
 
 2005-10-13 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * left.php: preselect db if only one db
diff --git a/footer.inc.php b/footer.inc.php
index 6fa1d462f..6d222badb 100644
--- a/footer.inc.php
+++ b/footer.inc.php
@@ -122,7 +122,6 @@ if (isset($GLOBALS['userlink']) && $GLOBALS['userlink']) {
 
 include('./config.footer.inc.php');
 ?>
-    <script type="text/javascript" language="javascript" src="libraries/tooltip.js"></script>
 </body>
 </html>
 <?php
@@ -153,4 +152,4 @@ if ( ! empty( $GLOBALS['cfg']['OBGzip'] )
  * Stops the script execution
  */
 exit;
-?>
\ No newline at end of file
+?>
diff --git a/header.inc.php b/header.inc.php
index 6734f5807..40f44b5d9 100644
--- a/header.inc.php
+++ b/header.inc.php
@@ -129,6 +129,7 @@ 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>