diff --git a/core/modules/menu_link_content/menu_link_content.routing.yml b/core/modules/menu_link_content/menu_link_content.routing.yml
index cebc134..b64b362 100644
--- a/core/modules/menu_link_content/menu_link_content.routing.yml
+++ b/core/modules/menu_link_content/menu_link_content.routing.yml
@@ -12,6 +12,7 @@ menu_link_content.link_edit:
     _entity_form: 'menu_link_content.default'
     _title: 'Edit menu link'
   options:
+  # @todo Remove once https://www.drupal.org/node/2310475 is in.
     _admin_route: TRUE
   requirements:
     _entity_access: 'menu_link_content.update'
diff --git a/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php b/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php
index 54f174a..8338142 100644
--- a/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php
+++ b/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php
@@ -211,7 +211,7 @@ protected function extractUrl($url) {
    */
   public function extractFormValues(array &$form, array &$form_state) {
     $new_definition = array();
-    $new_definition['expanded'] = !empty($form_state['values']['expanded']) ? 1 : 0;
+    $new_definition['expanded'] = !empty($form_state['values']['expanded']['value']) ? 1 : 0;
     $new_definition['hidden'] = empty($form_state['values']['enabled']) ? 1 : 0;
     list($menu_name, $parent) = explode(':', $form_state['values']['menu_parent'], 2);
     if (!empty($menu_name)) {