diff --git a/menu_attributes.module b/menu_attributes.module
index 894d5f6..b1fa975 100644
--- a/menu_attributes.module
+++ b/menu_attributes.module
@@ -162,12 +162,10 @@ function menu_attributes_form_node_form_submit($form, &$form_state) {
  *   The optional existing menu item for context.
  */
 function _menu_attributes_form_alter(&$form, $item = array(), &$complete_form) {
+  $form['options']['#type'] = 'form';
   $form['options']['#tree'] = TRUE;
   $form['options']['#weight'] = 50;
 
-  // Unset the previous value so that the new values get saved.
-  unset($form['options']['#value']['attributes']);
-
   $form['options']['attributes'] = array(
     '#type' => 'fieldset',
     '#title' => t('Menu item attributes'),