diff --git a/core/modules/outside_in/js/offcanvas.js b/core/modules/outside_in/js/offcanvas.js
index e0f2d00..8ec02a0 100644
--- a/core/modules/outside_in/js/offcanvas.js
+++ b/core/modules/outside_in/js/offcanvas.js
@@ -119,8 +119,7 @@
     else {
       Drupal.announce(Drupal.t('Configuration tray opened.'));
     }
-
-
+    Drupal.attachBehaviors($('#offcanvas'),drupalSettings);
   };
 
 })(jQuery, Drupal);
diff --git a/core/modules/outside_in/src/Block/BlockEntityOffCanvasForm.php b/core/modules/outside_in/src/Block/BlockEntityOffCanvasForm.php
index a77a6a6..7f5c868 100644
--- a/core/modules/outside_in/src/Block/BlockEntityOffCanvasForm.php
+++ b/core/modules/outside_in/src/Block/BlockEntityOffCanvasForm.php
@@ -5,6 +5,7 @@
 use Drupal\block\BlockForm;
 use Drupal\Core\Block\BlockPluginInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
 
 /**
  * @todo.
@@ -17,6 +18,25 @@ class BlockEntityOffCanvasForm extends BlockForm {
   public function form(array $form, FormStateInterface $form_state) {
     $form = parent::form($form, $form_state);
 
+    // Create link to full block form.
+    $query = [];
+    $advance_url = Url::fromRoute(
+      'entity.block.edit_form',
+      [
+        'block' => $this->entity->id(),
+      ]
+    );
+
+    if ($destination = $this->getRequest()->query->has('destination')) {
+      $query['destination'] = $this->getRequest()->query->get('destination');
+      $advance_url->setOption('query', $query);
+    }
+    $form['advanced_link'] = [
+      '#type' => 'link',
+      '#title' => $this->t('Advanced Options'),
+      '#url' => $advance_url,
+      '#weight' => 1000,
+    ];
     // Remove the ID and region elements.
     unset($form['id'], $form['region']);
     return $form;
diff --git a/core/modules/outside_in/src/Form/SystemBrandingOffCanvasForm.php b/core/modules/outside_in/src/Form/SystemBrandingOffCanvasForm.php
index b8254c1..a180eb0 100644
--- a/core/modules/outside_in/src/Form/SystemBrandingOffCanvasForm.php
+++ b/core/modules/outside_in/src/Form/SystemBrandingOffCanvasForm.php
@@ -61,10 +61,10 @@ public function setPlugin($plugin) {
    * {@inheritdoc}
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['original'] = $this->plugin->buildConfigurationForm([], $form_state);
+    $form = $this->plugin->buildConfigurationForm([], $form_state);
 
     // Unset links to Site Information form, we can make these changes here.
-    unset($form['original']['block_branding']['use_site_name']['#description'], $form['original']['block_branding']['use_site_slogan']['#description']);
+    unset($form['block_branding']['use_site_name']['#description'], $form['block_branding']['use_site_slogan']['#description']);
 
     $site_config = $this->configFactory->getEditable('system.site');
     $form['site_information'] = [