diff --git a/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php b/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php
index 3230a41..7b6cfe1 100644
--- a/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php
+++ b/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php
@@ -97,13 +97,14 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       $element['uri']['#description'] = $this->t('This can be an internal Drupal path such as %add-node or an external URL such as %drupal. Enter %front to link to the front page.', array('%front' => '<front>', '%add-node' => 'node/add', '%drupal' => 'http://drupal.org'));
     }
 
+    $title_is_enabled = $this->getFieldSetting('title') != DRUPAL_DISABLED;
     $element['title'] = array(
       '#type' => 'textfield',
       '#title' => $this->t('Link text'),
       '#placeholder' => $this->getSetting('placeholder_title'),
       '#default_value' => isset($items[$delta]->title) ? $items[$delta]->title : NULL,
       '#maxlength' => 255,
-      '#access' => $this->getFieldSetting('title') != DRUPAL_DISABLED,
+      '#access' => $title_is_enabled,
     );
     // Post-process the title field to make it conditionally required if URL is
     // non-empty. Omit the validation on the field edit form, since the field
@@ -121,9 +122,15 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       '#attributes' => array('class' => array('link-field-widget-attributes')),
     );
 
-    // If cardinality is 1, ensure a label is output for the field by wrapping it
-    // in a details element.
-    if ($this->fieldDefinition->getFieldStorageDefinition()->getCardinality() == 1) {
+    // If cardinality is 1, a title and URI form elements will mix with other
+    // form elements and not appear related. Ensure a label is output for the
+    // link field and the title and URI form elements are grouped by making it
+    // a fieldset. When the cardinality is greater than one, each set of title
+    // and URI form elements are already grouped visually, because of the UI
+    // that allows reordering them. Also, if the title form element is not shown
+    // we do not need the grouping. So, only make it a fieldset when title is
+    // enabled.
+    if ($this->fieldDefinition->getFieldStorageDefinition()->getCardinality() == 1 && $title_is_enabled) {
       $element += array(
         '#type' => 'fieldset',
       );
diff --git a/core/modules/menu_link_content/src/Entity/MenuLinkContent.php b/core/modules/menu_link_content/src/Entity/MenuLinkContent.php
index 420ebca..8131c74 100644
--- a/core/modules/menu_link_content/src/Entity/MenuLinkContent.php
+++ b/core/modules/menu_link_content/src/Entity/MenuLinkContent.php
@@ -282,8 +282,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
       ->setSetting('default_value', 'tools');
 
     $fields['link'] = BaseFieldDefinition::create('link')
-      ->setLabel(t('Link'))
-      ->setDescription(t('The location this menu link points to.'))
+      ->setLabel(t('Menu link location'))
       ->setRequired(TRUE)
       ->setSettings(array(
         'default_value' => '',