diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php
index de9cc45cc1..61ec232bd4 100644
--- a/libraries/navigation/NavigationTree.class.php
+++ b/libraries/navigation/NavigationTree.class.php
@@ -839,14 +839,6 @@ class PMA_NavigationTree
                 || (! in_array($parentName, $sterile) && ! $node->isNew)
                 || (in_array($node->real_name, $sterile))
             ) {
-                $loaded = '';
-                if ($node->is_group) {
-                    $loaded = ' loaded';
-                }
-                $container = '';
-                if ($node->type == Node::CONTAINER) {
-                    $container = ' container';
-                }
                 $retval .= "<div class='block'>";
                 $iClass = '';
                 if ($class == 'first') {
@@ -866,7 +858,6 @@ class PMA_NavigationTree
                         }
                     }
                     if ($match) {
-                        $loaded = ' loaded';
                         if (! $node->is_group) {
                             $icon = PMA_Util::getImage(
                                 'b_minus.png'
@@ -885,16 +876,14 @@ class PMA_NavigationTree
                         }
                     }
                     if ($match) {
-                        $loaded = ' loaded';
                         $icon  = PMA_Util::getImage('b_minus.png');
                         break;
                     }
                 }
 
-                if (! $GLOBALS['cfg']['NavigationTreeDisableDatabaseExpansion']) {
-                    $retval .= "<a class='expander$loaded$container'";
-                } else {
-                    $retval .= "<a";
+                $retval .= '<a class="' . $note->getCssClasses($match) . '"';
+
+                if ($GLOBALS['cfg']['NavigationTreeDisableDatabaseExpansion']) {
                     $icon = "";
                 }
                 $retval .= " href='#'>";
diff --git a/libraries/navigation/Nodes/Node.class.php b/libraries/navigation/Nodes/Node.class.php
index 70dd75b098..c310008c27 100644
--- a/libraries/navigation/Nodes/Node.class.php
+++ b/libraries/navigation/Nodes/Node.class.php
@@ -457,5 +457,30 @@ class Node
     {
         return '';
     }
+
+    /**
+     * Returns CSS classes for a node
+     *
+     * @param boolean $match Whether the node matched loaded tree
+     *
+     * @return String with html classes.
+     */
+    public function getCssClasses($match)
+    {
+        if ($GLOBALS['cfg']['NavigationTreeDisableDatabaseExpansion']) {
+            return '';
+        }
+
+        $result = array('expander');
+
+        if ($this->is_group || $match) {
+            $result[] = 'loaded';
+        }
+        if ($this->type == Node::CONTAINER) {
+            $result[] = 'container';
+        }
+
+        return implode(' ', $result);
+    }
 }
 ?>