diff --git a/ChangeLog b/ChangeLog
index 7bcd2ddbd..af9b79cb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
 
 3.4.11.0 (not yet released)
 - bug #3486970 [import] Exception on XML import
+- bug #3488777 [navi] $cfg['ShowTooltipAliasTB'] and blank names in navigation
 
 3.4.10.0 (2012-02-14)
 - bug #3460090 [interface] TextareaAutoSelect feature broken
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 976fabbd2..560953fb8 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -809,7 +809,9 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count =
 
 
         if ($GLOBALS['cfg']['ShowTooltipAliasTB']
-          && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested') {
+            && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested'
+            && $table['Comment'] // do not switch if the comment is empty
+        ) {
             // switch tooltip and name
             $table['disp_name'] = $table['Comment'];
             $table['Comment'] = $table['Name'];