diff --git a/ChangeLog b/ChangeLog
index 059bcb04a6..c435f50b7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@ phpMyAdmin - ChangeLog
 + rfe #1363 Improved query profiler
 
 4.0.4.0 (not yet released)
+- bug #3959 Using DefaultTabDatabase in NavigationTree for Database Click
 
 4.0.3.0 (not yet released)
 - bug #3941 Recent tables list always empty
diff --git a/libraries/navigation/Nodes/Node_Database.class.php b/libraries/navigation/Nodes/Node_Database.class.php
index f0d1b1b272..7c2a1717b4 100644
--- a/libraries/navigation/Nodes/Node_Database.class.php
+++ b/libraries/navigation/Nodes/Node_Database.class.php
@@ -31,7 +31,8 @@ class Node_Database extends Node
         parent::__construct($name, $type, $is_group);
         $this->icon  = PMA_Util::getImage('s_db.png');
         $this->links = array(
-            'text' => 'db_structure.php?server=' . $GLOBALS['server']
+            'text' => $GLOBALS['cfg']['DefaultTabDatabase']
+                    . '?server=' . $GLOBALS['server']
                     . '&db=%1$s&token=' . $GLOBALS['token'],
             'icon' => 'db_operations.php?server=' . $GLOBALS['server']
                     . '&db=%1$s&token=' . $GLOBALS['token']