diff --git a/ChangeLog b/ChangeLog
index 4cb3b3cc3e..57c2c4d880 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog
 - issue #11592 Missing headers in zipped export
 - issue #11590 Parser: Array to string conversion
 - issue #11597 Huge binary log growth on 4.5.x
+- issue #11594 'only_db' config option bug when db names contain underscore and are grouped
 
 4.5.1.0 (2015-10-23)
 - issue        Invalid argument supplied for foreach()
diff --git a/libraries/navigation/nodes/Node.php b/libraries/navigation/nodes/Node.php
index 1306e3ff92..2db8159f06 100644
--- a/libraries/navigation/nodes/Node.php
+++ b/libraries/navigation/nodes/Node.php
@@ -446,7 +446,8 @@ class Node
             $query .= "ORDER BY DB_first_level ASC ";
             $query .= "LIMIT $pos, $maxItems";
             $query .= ") t2 ";
-            $query .= "WHERE 1 = LOCATE(CONCAT(DB_first_level, ";
+            $query .= $this->_getWhereClause('SCHEMA_NAME', $searchClause);
+            $query .= " AND 1 = LOCATE(CONCAT(DB_first_level, ";
             $query .= "'$dbSeparator'), ";
             $query .= "CONCAT(SCHEMA_NAME, ";
             $query .= "'$dbSeparator')) ";
@@ -478,7 +479,7 @@ class Node
             }
 
             $query = "SHOW DATABASES ";
-            $query .= $this->_getWhereClause('Database', '');
+            $query .= $this->_getWhereClause('Database', $searchClause);
             $query .= " AND (";
             $subClauses = array();
             foreach ($prefixes as $prefix) {