diff --git a/libraries/config.default.php b/libraries/config.default.php
index bfe685d5f6..5dbf5877d3 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -650,6 +650,13 @@ $cfg['MaxDbList'] = 100;
  */
 $cfg['MaxTableList'] = 250;
 
+/**
+ * Disables the possibility of database expansion
+ *
+ * @global boolean $cfg['DisableDatabaseExpansion']
+ */
+$cfg['DisableDatabaseExpansion'] = false;
+
 /**
  * whether to show hint or not
  *
diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php
index 4a867657eb..1f7f23fe5c 100644
--- a/libraries/navigation/NavigationTree.class.php
+++ b/libraries/navigation/NavigationTree.class.php
@@ -874,7 +874,12 @@ class PMA_NavigationTree
                     }
                 }
 
-                $retval .= "<a class='expander$loaded$container'";
+                if(!$GLOBALS['cfg']['DisableDatabaseExpansion'])
+                    $retval .= "<a class='expander$loaded$container'";
+                else {
+                    $retval .= "<a";
+                    $icon = "";
+                }
                 $retval .= " href='#'>";
                 $retval .= "<span class='hide aPath'>";
                 $retval .= $paths['aPath'];