diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php
index 4a69aa7ada..d8e2818d88 100644
--- a/libraries/navigation/NavigationTree.class.php
+++ b/libraries/navigation/NavigationTree.class.php
@@ -844,9 +844,11 @@ class PMA_NavigationTree
                     $retval .= htmlspecialchars($node->name);
                     $retval .= "</a>";
                 } else {
-                    $title = $node->getComment();
-                    if ($title) {
-                        $title = " title='" . htmlentities($title, ENT_QUOTES) . "'";
+                    if ($GLOBALS['cfg']['ShowTooltip']) {
+                        $title = $node->getComment();
+                        if ($title) {
+                            $title = " title='" . htmlentities($title, ENT_QUOTES) . "'";
+                        }
                     }
                     $retval .= "<a$linkClass$title href='$link'>";
                     $retval .= htmlspecialchars($node->real_name);