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 2d12b0d..5569977 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
@@ -291,7 +291,6 @@ public function buildOptionsForm(&$form, &$form_state) {
       '#type' => 'details',
       '#title' => t('Administrative title'),
       '#collapsed' => TRUE,
-      '#tree' => FALSE,
       '#weight' => 150,
     );
     $form['admin_label']['admin_label'] = array(
@@ -299,6 +298,7 @@ public function buildOptionsForm(&$form, &$form_state) {
       '#title' => t('Administrative title'),
       '#description' => t('This title will be displayed on the views edit page instead of the default one. This might be useful if you have the same item twice.'),
       '#default_value' => $this->options['admin_label'],
+      '#parents' => array('options', 'admin_label'),
     );
 
     // This form is long and messy enough that the "Administrative title" option