diff --git a/ChangeLog b/ChangeLog
index 7ccef809b..c3a9c76eb 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,9 @@ $Id$
 $Source$
 
 2002-07-25 Loïc Chapeaux  <lolo@phpheaven.net>
-    * libraries/sqlparser.lib.php3: PHP3 parse errors fixed,
+    * libraries/sqlparser.lib.php3: PHP3 parse errors fixed.
+    * header.inc.php3, lines 155-156: better "fix" against bug
+      #585094 (Runtime Error on Line 62).
 
 2002-07-24 Robin Johnson  <robbat2@users.sourceforge.net>
     * config.inc.php3:
diff --git a/header.inc.php3 b/header.inc.php3
index 5a5ecf369..99ab5baf7 100755
--- a/header.inc.php3
+++ b/header.inc.php3
@@ -152,7 +152,8 @@ $title     .= (empty($title) ? '' : ' - ') . 'phpMyAdmin ' . PMA_VERSION;
 <script type="text/javascript" language="javascript">
 <!--
 // Updates the title of the frameset if possible (ns4 does not allow this)
-if (typeof(parent.document) != 'undefined' && typeof(parent.document.title) == 'string') {
+if (typeof(parent.document) != 'undefined' && typeof(parent.document) == 'unknown'
+    && typeof(parent.document.title) == 'string') {
     parent.document.title = '<?php echo $title; ?>';
 }
 <?php