--- includes\menu.inc	2010-02-01 19:00:49.000000000 +0100
+++ includes\menu.inc	2010-08-13 10:06:15.718750000 +0200
@@ -1560,8 +1560,8 @@ function menu_set_active_trail($new_trai
     list($key, $curr) = each($tree);
 
     while ($curr) {
-      // Terminate the loop when we find the current path in the active trail.
-      if ($curr['link']['href'] == $item['href']) {
+      // Terminate the loop when we find the current path in the active trail and there's no link below.
+      if ($curr['link']['href'] == $item['href'] && !$curr['below']) {
         $trail[] = $curr['link'];
         $curr = FALSE;
       }