diff --git a/ChangeLog b/ChangeLog
index 1c34496e8..2be237ac1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -82,6 +82,7 @@ $Id$
 + [doc] Incorporate synchronisation docs into main document.
 + [core] Include Content Security Policy HTTP headers.
 - bug #3004216 [CSS] Field attributes use inline CSS
+- patch #2999595, rfe #2998130 [interface] Cleanup navigation frame.
 
 3.3.4.0 (not yet released)
 - bug #2996161 [import] properly escape import value
diff --git a/navigation.php b/navigation.php
index 21ef3208e..909bc0054 100644
--- a/navigation.php
+++ b/navigation.php
@@ -230,7 +230,6 @@ if (! $GLOBALS['server']) {
 
     <div id="databaseList">
     <form method="post" action="index.php" target="_parent" id="left">
-    <label for="lightm_db"><?php echo __('Database'); ?></label>
     <?php
         echo PMA_generate_common_hidden_inputs() . "\n";
         echo $GLOBALS['pma']->databases->getHtmlSelectGrouped(true, $_SESSION['tmp_user_values']['navi_limit_offset'], $GLOBALS['cfg']['MaxDbList']) . "\n";
@@ -299,19 +298,6 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) {
         $db_tooltip     = $GLOBALS['db'];
     }
 
-    ?>
-    <p><a class="item"
-        href="<?php echo $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . $common_url_query; ?>"
-        title="<?php echo htmlspecialchars($db_tooltip); ?>" >
-    <?php
-    if ($GLOBALS['text_dir'] === 'rtl') {
-        echo ' <bdo dir="ltr">(' . $table_count . ')</bdo> ';
-    }
-    echo '<span class="navi_dbName">' . htmlspecialchars($disp_name) . '</span>';
-    if ($GLOBALS['text_dir'] === 'ltr') {
-        echo ' <bdo dir="ltr">(' . $table_count . ')</bdo> ';
-    }
-    echo '</a></p>';
     if ($table_count) {
         ?>
         <span id="NavFilter">