--- includes/menu.inc	2010-05-06 07:59:30.000000000 +0200
+++ includes/menu.inc	2010-05-15 19:06:52.165824000 +0200
@@ -2124,8 +2124,8 @@ function menu_set_active_trail($new_trai
     }
 
     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;
       }