diff --git a/libraries/navigation/Nodes/Node.class.php b/libraries/navigation/Nodes/Node.class.php
index 83c53aea1c..02fb5443d0 100644
--- a/libraries/navigation/Nodes/Node.class.php
+++ b/libraries/navigation/Nodes/Node.class.php
@@ -759,19 +759,6 @@ class Node
                     . ' class="hideNavItem ajax">'
                     . PMA_Util::getImage('lightbulb_off.png', __('Hide'))
                     . '</a></span>';
-            } else if ($this instanceof Node_Database) {
-                if ($this->hiddenCount > 0) {
-                    $ret = '<span class="dbItemControls">'
-                        . '<a href="navigation.php'
-                        . PMA_URL_getCommon()
-                        . '&showUnhideDialog=true'
-                        . '&dbName=' . urldecode($this->real_name) . '"'
-                        . ' class="showUnhide ajax">'
-                        . PMA_Util::getImage(
-                            'lightbulb.png', __('Show hidden items')
-                        )
-                        . '</a></span>';
-                }
             }
         }
         return $ret;
diff --git a/libraries/navigation/Nodes/Node_Database.class.php b/libraries/navigation/Nodes/Node_Database.class.php
index f3530e07bb..6464e21a41 100644
--- a/libraries/navigation/Nodes/Node_Database.class.php
+++ b/libraries/navigation/Nodes/Node_Database.class.php
@@ -639,6 +639,33 @@ class Node_Database extends Node
         return $retval;
     }
 
+    /**
+     * Returns HTML for control buttons displayed infront of a node
+     *
+     * @return String HTML for control buttons
+     */
+    public function getHtmlForControlButtons()
+    {
+        $ret = '';
+        $cfgRelation = PMA_getRelationsParam();
+        if (isset($cfgRelation['navwork']) && $cfgRelation['navwork']) {
+            if ($this->hiddenCount > 0) {
+                $ret = '<span class="dbItemControls">'
+                    . '<a href="navigation.php'
+                    . PMA_URL_getCommon()
+                    . '&showUnhideDialog=true'
+                    . '&dbName=' . urldecode($this->real_name) . '"'
+                    . ' class="showUnhide ajax">'
+                    . PMA_Util::getImage(
+                        'lightbulb.png', __('Show hidden items')
+                    )
+                    . '</a></span>';
+            }
+
+        }
+        return $ret;
+    }
+
     /**
      * Sets the number of hidden items in this database
      *