diff --git a/ChangeLog b/ChangeLog
index f876b4f333..5cd6864a02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
 ======================
 
 4.2.0.0 (not yet released)
++ rfe #1662 Add table comment tool tip in database structure page
 + rfe #1447 Single table for display Character Sets and Collations
 + rfe #1455 Display icons/text/both for the table row actions
 + rfe #1473 Transformation to convert Boolean value to text
diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php
index c27e1c5cb5..791e4d3062 100644
--- a/libraries/structure.lib.php
+++ b/libraries/structure.lib.php
@@ -52,7 +52,8 @@ function PMA_getHtmlForActionLinks($current_table, $table_is_view, $tbl_url_quer
     }
     $search_table .= '</a>';
 
-    $browse_table_label = '<a href="sql.php?' . $tbl_url_query . '&amp;pos=0">'
+    $browse_table_label = '<a href="sql.php?' . $tbl_url_query
+        . '&amp;pos=0" title="' . $current_table['TABLE_COMMENT'] . '">'
         . $truename . '</a>';
 
     if (!$db_is_information_schema) {
diff --git a/test/libraries/PMA_structure_test.php b/test/libraries/PMA_structure_test.php
index 538346be4a..d8adf3d27c 100644
--- a/test/libraries/PMA_structure_test.php
+++ b/test/libraries/PMA_structure_test.php
@@ -70,6 +70,7 @@ class PMA_Structure_Test extends PHPUnit_Framework_TestCase
         $current_table = array(
             'TABLE_ROWS' => 3,
             'TABLE_NAME' => 'name1',
+            'TABLE_COMMENT' => 'This is a test comment'
         );
         $table_is_view = false;
         $tbl_url_query = 'tbl_url_query';
@@ -136,6 +137,7 @@ class PMA_Structure_Test extends PHPUnit_Framework_TestCase
         $current_table = array(
             'TABLE_ROWS' => 0,
             'TABLE_NAME' => 'name1',
+            'TABLE_COMMENT' => 'This is a test comment'
         );
         $table_is_view = false;
         list(