diff --git a/ChangeLog b/ChangeLog
index 40c66f8d79..74abd05c7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@ phpMyAdmin - ChangeLog
 - bug #4694 js error on marking table as favorite in Safari (in private mode)
 - bug #4695 Changing $cfg['DefaultTabTable'] doesn't update link and title
 - bug       Undefined index menuswork
+- bug       Undefined index navwork
 
 4.3.6.0 (2015-01-07)
 - bug       Undefined index notices while configuring recent and favorite tables
diff --git a/libraries/navigation/Nodes/Node_Database.class.php b/libraries/navigation/Nodes/Node_Database.class.php
index 9abb521eef..74dff6cd35 100644
--- a/libraries/navigation/Nodes/Node_Database.class.php
+++ b/libraries/navigation/Nodes/Node_Database.class.php
@@ -624,7 +624,7 @@ class Node_Database extends Node
     {
         $ret = '';
         $cfgRelation = PMA_getRelationsParam();
-        if ($cfgRelation['navwork']) {
+        if (isset($cfgRelation['navwork']) && $cfgRelation['navwork']) {
             if ( $this->_hiddenCount > 0) {
                 $ret = '<span class="dbItemControls">'
                     . '<a href="navigation.php'