diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index e073b63737..e205fcc517 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2120,6 +2120,9 @@ function PMA_dbPageSelector($databases_count, $pos, $_url_params, $script, $fram
 
     if ($GLOBALS['cfg']['MaxDbList']
      && $GLOBALS['cfg']['MaxDbList'] < $databases_count) {
+        if ('frame_navigation' == $frame) {
+            echo '<div id="navidbpageselector">' . "\n";
+        }
         echo $GLOBALS['strPageNumber'] . '<br />';
         // Move to the beginning or to the previous page
         if ($pos > 0) {
@@ -2176,6 +2179,9 @@ function PMA_dbPageSelector($databases_count, $pos, $_url_params, $script, $fram
                 . $caption4 . '</a>';
         }
         echo "\n";
+        if ('frame_navigation' == $frame) {
+            echo '</div>' . "\n";
+        }
     }
 }
 
diff --git a/navigation.php b/navigation.php
index 1abc4a0d48..ccd431344b 100644
--- a/navigation.php
+++ b/navigation.php
@@ -588,9 +588,7 @@ function PMA_displayTableList($tables, $visible = false,
 
 echo '</div>' . "\n";
 
-echo '<div id="navidbpageselector">' . "\n";
 $_url_params = array('pos' => $pos);
 PMA_dbPageSelector($GLOBALS['PMA_List_Database']->count(), $pos, $_url_params, 'navigation.php', 'frame_navigation');
-echo '</div>' . "\n";
 PMA_exitNavigationFrame();
 ?>