diff --git a/core/modules/path/path.module b/core/modules/path/path.module
index 182c6a9..e77e3fd 100644
--- a/core/modules/path/path.module
+++ b/core/modules/path/path.module
@@ -37,16 +37,21 @@ function path_help($route_name, RouteMatchInterface $route_match) {
 }
 
 /**
- * Implements hook_form_BASE_FORM_ID_alter() for \Drupal\node\NodeForm.
+ * Adds the path settings group to the advanced section.
+ *
+ * @param array $form
+ *   The form array.
+ * @param \Drupal\Core\Form\FormStateInterface $form_state
+ *   The form state object.
  */
-function path_form_node_form_alter(&$form, FormStateInterface $form_state) {
-  $node = $form_state->getFormObject()->getEntity();
+function path_entity_form(&$form, FormStateInterface $form_state) {
+  $entity = $form_state->getFormObject()->getEntity();
   $form['path_settings'] = array(
     '#type' => 'details',
     '#title' => t('URL path settings'),
     '#open' => !empty($form['path']['widget'][0]['alias']['#value']),
     '#group' => 'advanced',
-    '#access' => !empty($form['path']['#access']) && $node->hasField('path') && $node->get('path')->access('edit'),
+    '#access' => !empty($form['path']['#access']) && $entity->hasField('path') && $entity->get('path')->access('edit'),
     '#attributes' => array(
       'class' => array('path-form'),
     ),
@@ -59,6 +64,20 @@ function path_form_node_form_alter(&$form, FormStateInterface $form_state) {
 }
 
 /**
+ * Implements hook_form_BASE_FORM_ID_alter() for \Drupal\node\NodeForm.
+ */
+function path_form_node_form_alter(&$form, FormStateInterface $form_state) {
+  path_entity_form($form, $form_state);
+}
+
+/**
+ * Implements hook_form_BASE_FORM_ID_alter() for taxonomy_term_form().
+ */
+function path_form_taxonomy_term_form_alter(&$form, FormStateInterface $form_state) {
+  path_entity_form($form, $form_state);
+}
+
+/**
  * Implements hook_entity_base_field_info().
  */
 function path_entity_base_field_info(EntityTypeInterface $entity_type) {
diff --git a/core/modules/taxonomy/src/TermForm.php b/core/modules/taxonomy/src/TermForm.php
index 1f56351..ced1c4b 100644
--- a/core/modules/taxonomy/src/TermForm.php
+++ b/core/modules/taxonomy/src/TermForm.php
@@ -23,11 +23,17 @@ public function form(array $form, FormStateInterface $form_state) {
     $form_state->set(['taxonomy', 'parent'], $parent);
     $form_state->set(['taxonomy', 'vocabulary'], $vocabulary);
 
+    $form['advanced'] = array(
+      '#type' => 'vertical_tabs',
+      '#weight' => 99,
+    );
+
     $form['relations'] = array(
       '#type' => 'details',
       '#title' => $this->t('Relations'),
+      '#group' => 'advanced',
       '#open' => $vocabulary->getHierarchy() == VocabularyInterface::HIERARCHY_MULTIPLE,
-      '#weight' => 10,
+      '#weight' => 40,
     );
 
     // \Drupal\taxonomy\TermStorageInterface::loadTree() and