--- hs_menu.module.original	2008-07-16 23:12:23.000000000 +0200
+++ hs_menu.module	2008-07-21 13:34:26.000000000 +0200
@@ -14,29 +14,46 @@
  * Implementation of hook_form_alter().
  */
 function hs_menu_form_alter($form_id, &$form) {
+  if (isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id) {
+    $item = array();
+    if ($form['nid']['#value'] > 0) {
+      $item = db_fetch_array(db_query("SELECT * FROM {menu} WHERE path = 'node/%d'", $form['nid']['#value']));
+      if (isset($form['#post']['menu']) && is_array($form['#post']['menu'])) {
+        $item = !is_array($item) ? $form['#post']['menu'] : (($form['#post']['op'] == t('Preview')) ? array_merge($item, $form['#post']['menu']) : array_merge($form['#post']['menu'], $item));
+      }
+    }
+    
+    hs_menu_form_alter_helper($form_id, &$form);
+  }
+  
   if ($form_id == 'menu_edit_item_form') {
-    unset($form['pid']['#options']);
-    $form['pid']['#type'] = 'hierarchical_select';
-    $form['pid']['#config'] = array(
-      'module' => 'hs_menu',
-      'params' => array(
-        'mid' => $form['mid']['#value'],
-      ),
-      'save_lineage'    => 0,
-      'enforce_deepest' => 0,
-      'level_labels' => array(
-        'status' => 0,
-      ),
-      'dropbox' => array(
-        'status' => 0,
-      ),
-      'editability' => array(
-        'status' => 0,
-      ),
-    );
+    hs_menu_form_alter_helper($form_id, &$form);
   }
 }
 
+// helper for hs_menu_form_alter
+function hs_menu_form_alter_helper($form_id, &$form) {
+  unset($form['menu']['pid']['#options']);
+  $form['menu']['pid']['#type'] = 'hierarchical_select';
+  $form['menu']['pid']['#config'] = array(
+    'module' => 'hs_menu',
+    'params' => array(
+      'mid' => $form['mid']['#value'],
+    ),
+    'save_lineage'    => 0,
+    'enforce_deepest' => 0,
+    'level_labels' => array(
+      'status' => 0,
+    ),
+    'dropbox' => array(
+      'status' => 0,
+    ),
+    'editability' => array(
+      'status' => 0,
+    ),
+  );
+}
+
 
 //----------------------------------------------------------------------------
 // Hierarchical Select hooks.