diff --git a/ChangeLog b/ChangeLog
index 3f5865ef5..e1c212ce2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-08-11 Marc Delisle  <lem9@users.sourceforge.net>
+    * queryframe.php: shorten the path of db subtree items,
+      thanks to Edward Rudd - urkle
+	  
 2005-08-09 Marc Delisle  <lem9@users.sourceforge.net>
     * read_dump.php: add unique numbers to $strFileCouldNotBeRead to
       improve support when someone gets this error
diff --git a/queryframe.php b/queryframe.php
index 13f64b720..18740b5d2 100644
--- a/queryframe.php
+++ b/queryframe.php
@@ -360,6 +360,7 @@ if ($num_dbs > 1) {
                 $selected = '';
             } // end if... else...
 
+            $db_disp = $db;
             if ($cfg['LeftFrameDBTree']) {
                 if ($i == 0) {
                     $parts = explode($cfg['LeftFrameDBSeparator'],$db,2);
@@ -376,16 +377,19 @@ if ($num_dbs > 1) {
                         . '<optgroup label="'.htmlspecialchars($parts[0]).'">'."\n";
                     $parent = $parts[0];
                 }
+                if (count($parts) > 1 && $parent == $parts[0]) {
+                    $db_disp = $parts[1];
+                }
             }
             
             if (!empty($num_tables)) {
                 echo '            '
                    . '<option value="' . htmlspecialchars($db) . '"' . $selected . '>'
-                   . ($db_tooltip != '' && $cfg['ShowTooltipAliasDB'] ? htmlspecialchars($db_tooltip) : htmlspecialchars($db)) . ' (' . $num_tables . ')</option>' . "\n";
+                   . ($db_tooltip != '' && $cfg['ShowTooltipAliasDB'] ? htmlspecialchars($db_tooltip) : htmlspecialchars($cfg['LeftFrameDBSeparator'] . $db_disp)) . ' (' . $num_tables . ')</option>' . "\n";
             } else {
                 echo '            '
                    . '<option value="' . htmlspecialchars($db) . '"' . $selected . '>'
-                   . ($db_tooltip != '' && $cfg['ShowTooltipAliasDB'] ? htmlspecialchars($db_tooltip) : htmlspecialchars($db)) . ' (-)</option>' . "\n";
+                   . ($db_tooltip != '' && $cfg['ShowTooltipAliasDB'] ? htmlspecialchars($db_tooltip) : htmlspecialchars($cfg['LeftFrameDBSeparator'] . $db_disp)) . ' (-)</option>' . "\n";
             } // end if... else...
 
             if ($cfg['LeftFrameDBTree']) {