diff --git a/js/navigation.js b/js/navigation.js
index 6d613432ddf9..a59b3130c734 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -686,7 +686,7 @@ function PMA_showCurrentNavigation() {
             }
         }
     } else if ($('#navi_db_select').length && $('#navi_db_select').val()) {
-        $('#navi_db_select').val('').trigger('change');
+        $('#navi_db_select').val('').hide().trigger('change');
     }
     PMA_showFullName($('#pma_navigation_tree'));
 
@@ -867,6 +867,9 @@ function PMA_reloadNavigation(callback, paths) {
 
 function PMA_selectCurrentDb() {
     if ($('#navi_db_select').length) {
+        if (PMA_commonParams.get('db')) { // db selected
+            $('#navi_db_select').show();
+        }
         $('#navi_db_select').val(PMA_commonParams.get('db'));
         if ($('#navi_db_select').val() !== PMA_commonParams.get('db')) {
             return false;
diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php
index 83408d945763..74f1143cc656 100644
--- a/libraries/navigation/NavigationTree.class.php
+++ b/libraries/navigation/NavigationTree.class.php
@@ -1184,7 +1184,7 @@ public function renderDbSelect()
         $retval .= '<div id="pma_navigation_db_select">';
         $retval .= '<form action="index.php">';
         $retval .= PMA_getHiddenFields($url_params);
-        $retval .= '<select name="db" id="navi_db_select">'
+        $retval .= '<select name="db" class="hide" id="navi_db_select">'
             . '<option value="" dir="' . $GLOBALS['text_dir'] . '">'
             . '(' . __('Databases') . ') ...</option>' . "\n";
         $selected = $GLOBALS['db'];