diff --git a/includes/menu.inc b/includes/menu.inc
index 9619b3ea12ed546af7d3fb574069d84aa4048a3c..21067cd5c81b69ed78b89a16ea54c987a1c84337 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -1574,10 +1574,10 @@ function menu_set_active_trail($new_trail = NULL) {
         $curr = FALSE;
       }
       else {
-        // Move to the child link if it's in the active trail.
-        if ($curr['below'] && $curr['link']['in_active_trail']) {
+        // Add the link if it's in the active trail, then move to the link below.
+        if ($curr['link']['in_active_trail']) {
           $trail[] = $curr['link'];
-          $tree = $curr['below'];
+          $tree = $curr['below'] ? $curr['below'] : array();
         }
         list($key, $curr) = each($tree);
       }