diff --git a/navigation.php b/navigation.php
index 3a482c06f..03fdcc866 100644
--- a/navigation.php
+++ b/navigation.php
@@ -287,17 +287,16 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) {
      *       or the pos of tables. 
      */
     $table_list = PMA_getTableList($GLOBALS['db'], null, 0, $cfg['MaxTableList']);
-    $count_table_list = count($table_list);
-    if ($count_table_list > 0) {
+    if (! empty($table_list)) {
         PMA_displayTableList($table_list, true, '', $GLOBALS['db']);
         // hint user that the table list is larger, until the todo is done
-        if ($count_table_list == $GLOBALS['cfg']['MaxTableList']) {
+        if (count($table_list) <= $GLOBALS['cfg']['MaxTableList'] && PMA_getTableCount($GLOBALS['db']) > $GLOBALS['cfg']['MaxTableList']) {
             echo '&nbsp; ( 1 .. ', $GLOBALS['cfg']['MaxTableList'], ' / ', PMA_getTableCount($GLOBALS['db']), ' )'; 
         } 
     } else {
         echo $GLOBALS['strNoTablesFound'];
     }
-    unset($table_list, $count_table_list);
+    unset($table_list);
 } elseif ($GLOBALS['cfg']['LeftFrameLight']) {
     echo '<p>' . $GLOBALS['strSelectADb'] . '</p>' . "\n";
 } else {