Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.136
diff -u -d -F^\s*function -r1.136 menu.inc
--- includes/menu.inc	27 Sep 2006 07:02:32 -0000	1.136
+++ includes/menu.inc	12 Oct 2006 16:12:48 -0000
@@ -432,13 +432,14 @@ function menu_set_active_item($path = NU
   static $stored_mid;
 
   if (!isset($stored_mid) || isset($path)) {
-    $menu = menu_get_menu();
     if (!isset($path)) {
       $path = $_GET['q'];
     }
     else {
       $_GET['q'] = $path;
+      _menu_append_contextual_items();
     }
+    $menu = menu_get_menu();
 
     while ($path && !isset($menu['path index'][$path])) {
       $path = substr($path, 0, strrpos($path, '/'));