diff --git a/ChangeLog b/ChangeLog
index a80175a1e..cbf145231 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2006-02-22 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+    * libraries/footer.inc.php:
+      bug #1436279 Left frame links open in new windows in Safari
+
 2006-02-21 Michal Čihař  <michal@cihar.com>
     * scripts/setup.php:
         - Various bug fixes (bug #1435700, bug #1435806, undefined indexes).
diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
index 372176530..670438c6d 100644
--- a/libraries/footer.inc.php
+++ b/libraries/footer.inc.php
@@ -63,7 +63,14 @@ if (parent.querywindow && !parent.querywindow.closed && parent.querywindow.locat
 
 // reset content frame name, as querywindow needs to set a unique name
 // before submitting form data, and navigation frame needs the original name
-window.parent.frames[1].name = 'frame_content';
+if (window.parent.frames[1].name != 'frame_content') {
+    window.parent.frames[1].name = 'frame_content';
+}
+if (window.parent.frames[1].id != 'frame_content') {
+    window.parent.frames[1].id = 'frame_content';
+}
+//window.parent.frames[1].setAttribute('name', 'frame_content');
+//window.parent.frames[1].setAttribute('id', 'frame_content');
 //]]>
 </script>
 <?php