diff --git a/ChangeLog b/ChangeLog
index 5654501e1..68f0372bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - patch #2089240 [export] handle correctly switching SQL modes
 + rfe #1612724 [export] add option to export without comments
 - bug #2090002 [display] Cannot edit row in VIEW 
+- patch #2099962 [js] fix js error without frameset, thanks to Xuefer 
 
 3.0.0.0 (not yet released)
 + [export] properly handle line breaks for YAML, thanks to Dan Barry -
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 928db7e88..078ec2d4c 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -955,7 +955,8 @@ function PMA_reloadNavigation()
 <script type="text/javascript">
 //<![CDATA[
 if (typeof(window.parent) != 'undefined'
-    && typeof(window.parent.frame_navigation) != 'undefined') {
+    && typeof(window.parent.frame_navigation) != 'undefined'
+    && window.parent.goTo) {
     window.parent.goTo('<?php echo $reload_url; ?>');
 }
 //]]>
@@ -1000,7 +1001,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice')
         echo "\n";
         echo '<script type="text/javascript">' . "\n";
         echo '//<![CDATA[' . "\n";
-        echo "window.parent.updateTableTitle('" . $uni_tbl . "', '" . PMA_jsFormat($tooltip, false) . "');" . "\n";
+        echo "if (window.parent.updateTableTitle) window.parent.updateTableTitle('" . $uni_tbl . "', '" . PMA_jsFormat($tooltip, false) . "');" . "\n";
         echo '//]]>' . "\n";
         echo '</script>' . "\n";
     } // end if ... elseif
diff --git a/server_databases.php b/server_databases.php
index 13d2b48ad..d076d3b7d 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -211,7 +211,7 @@ if ($databases_count > 0) {
         }
         echo '    <td class="name">' . "\n"
            . '        <a onclick="'
-           . 'if (window.parent.openDb(\'' . PMA_jsFormat($current['SCHEMA_NAME'], false) . '\')) return false;'
+           . 'if (window.parent.openDb && window.parent.openDb(\'' . PMA_jsFormat($current['SCHEMA_NAME'], false) . '\')) return false;'
            . '" href="index.php?' . $url_query . '&amp;db='
            . urlencode($current['SCHEMA_NAME']) . '" title="'
            . sprintf($strJumpToDB, htmlspecialchars($current['SCHEMA_NAME']))
@@ -251,7 +251,7 @@ if ($databases_count > 0) {
             echo '    <td class="tool">' . "\n"
                . '        <a onclick="
                     // <![CDATA[
-                    window.parent.setDb(\'' . PMA_jsFormat($current['SCHEMA_NAME']) . '\');
+                    if (window.parent.setDb) window.parent.setDb(\'' . PMA_jsFormat($current['SCHEMA_NAME']) . '\');
                     // ]]>" href="./server_privileges.php?' . $url_query
                . '&amp;checkprivs=' . urlencode($current['SCHEMA_NAME'])
                . '" title="' . sprintf($strCheckPrivsLong, htmlspecialchars($current['SCHEMA_NAME']))