Index: hierarchical_select.module
===================================================================
--- hierarchical_select.module	(revision 3100)
+++ hierarchical_select.module	(working copy)
@@ -266,6 +266,9 @@
   // form in a subform_element in a form, then it is necessary.
   $form_id = $_POST['form_id'] = $storage['parameters'][0];
 
+  // Restore the original form's path.
+  menu_set_active_item($storage['path']);
+
   if (HS_DEVELOPER_MODE) {
     _hierarchical_select_log("form_id: $form_id");
     _hierarchical_select_log("hs_form_build_id: $hs_form_build_id");
@@ -635,6 +638,8 @@
       'parameters' => $parameters,
       // … determine which part of $form should be rendered.
       '#names'     => $names,
+      // save the current form's path.
+      'path' => $_GET['q'],
     );
 
     // Store the information needed for dynamic form updates in the cache, so