diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php
index c841203..3cd5e6a 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php
@@ -45,7 +45,7 @@ protected function defineOptions() {
   }
 
   /**
-   * Overrides \Drupal\user\Plugin\views\field\User::buildOptionsForm().
+   * {@inheritdoc}
    */
   public function buildOptionsForm(&$form, &$form_state) {
     parent::buildOptionsForm($form, $form_state);
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
index e50556f..2d12b0d 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
@@ -284,13 +284,14 @@ public function buildOptionsForm(&$form, &$form_state) {
 
     $form['fieldsets'] = array(
       '#type' => 'value',
-      '#value' => array('more'),
+      '#value' => array('more', 'admin_label'),
     );
 
     $form['admin_label'] = array(
       '#type' => 'details',
       '#title' => t('Administrative title'),
       '#collapsed' => TRUE,
+      '#tree' => FALSE,
       '#weight' => 150,
     );
     $form['admin_label']['admin_label'] = array(
diff --git a/core/modules/views_ui/admin.inc b/core/modules/views_ui/admin.inc
index 88ea4fb..e896086 100644
--- a/core/modules/views_ui/admin.inc
+++ b/core/modules/views_ui/admin.inc
@@ -276,7 +276,7 @@ function views_ui_pre_render_add_fieldset_markup($form) {
   }
 
   // Hide the fieldsets if there is nothing on there.
-  if (isset($form['#fieldsets'])) {
+  if (isset($form['fieldsets']['#value'])) {
     foreach ($form['fieldsets']['#value'] as $fieldset) {
       if (!element_children($form[$fieldset])) {
         $form[$fieldset]['#access'] = FALSE;