diff --git a/ChangeLog b/ChangeLog
index 1f2bfa47d..1e01690c5 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@ $Id$
 $Source$
 
 2004-05-07 Garvin Hicking <pma@supergarv.de>
+    * db_details_db_info.php: When $cfg['ShowTooltipAliasTB'] is set to
+      'nested', the displayed table names should always be the real names,
+      not the table comments.
     * libraries/display_tbl.lib.php, libraries/display_tbl_links.lib.php,
       librarries/functions.js: RFE #856208 - Show (un)check all boxes
       for query results.
diff --git a/db_details_db_info.php b/db_details_db_info.php
index 713b5f82c..394dced01 100644
--- a/db_details_db_info.php
+++ b/db_details_db_info.php
@@ -10,8 +10,8 @@ require_once('./libraries/common.lib.php');
 PMA_checkParameters(array('db'));
 
 function fillTooltip(&$tooltip_truename, &$tooltip_aliasname, &$tmp) {
-    $tooltip_truename[$tmp['Name']] = ($GLOBALS['cfg']['ShowTooltipAliasTB'] ? (!empty($tmp['Comment']) ? $tmp['Comment'] . ' ' : $tmp['Name']) : $tmp['Name']);
-    $tooltip_aliasname[$tmp['Name']] = ($GLOBALS['cfg']['ShowTooltipAliasTB'] ? $tmp['Name'] : (!empty($tmp['Comment']) ? $tmp['Comment'] . ' ' : $tmp['Name']));
+    $tooltip_truename[$tmp['Name']] = ($GLOBALS['cfg']['ShowTooltipAliasTB'] && $GLOBALS['cfg']['ShowTooltipAliasTB'] != 'nested' ? (!empty($tmp['Comment']) ? $tmp['Comment'] . ' ' : $tmp['Name']) : $tmp['Name']);
+    $tooltip_aliasname[$tmp['Name']] = ($GLOBALS['cfg']['ShowTooltipAliasTB'] && $GLOBALS['cfg']['ShowTooltipAliasTB'] != 'nested'  ? $tmp['Name'] : (!empty($tmp['Comment']) ? $tmp['Comment'] . ' ' : $tmp['Name']));
     if (isset($tmp['Create_time']) && !empty($tmp['Create_time'])) {
         $tooltip_aliasname[$tmp['Name']] .= ', ' . $GLOBALS['strStatCreateTime'] . ': ' . PMA_localisedDate(strtotime($tmp['Create_time']));
     }