diff --git a/core/modules/outside_in/js/outside_in.js b/core/modules/outside_in/js/outside_in.js
index a49dd60..715106e 100644
--- a/core/modules/outside_in/js/outside_in.js
+++ b/core/modules/outside_in/js/outside_in.js
@@ -3,7 +3,7 @@
  * Drupal's Settings Tray library.
  */
 
-(function ($, Drupal) {
+(function ($, Drupal, drupalSettings) {
 
   'use strict';
 
@@ -223,7 +223,7 @@
           var rendererOffcanvas = false;
           var wrapperOffcanvas = false;
           if (hasElement) {
-            rendererOffcanvas = $(instance.element).attr('data-dialog-renderer') === 'offcanvas'
+            rendererOffcanvas = $(instance.element).attr('data-dialog-renderer') === 'offcanvas';
             if (rendererOffcanvas) {
               wrapperOffcanvas = instance.options.url.indexOf(replaceLink) === -1;
             }
@@ -252,11 +252,11 @@
           }
           else {
             instance.options.url = instance.options.url.replace(searchFrom, replaceForm);
-            instance.options.data.formOptions = {messagesSelector: '.messages__wrapper'};
+            instance.options.data.formOptions = {messagesSelector: '.ui-dialog-offcanvas .messages__wrapper'};
           }
         });
       var qs = drupalSettings.path.currentQuery;
-      if (qs.hasOwnProperty('editable_id')) {
+      if (qs && qs.hasOwnProperty('editable_id')) {
         $('#' + qs.editable_id + ' a' + blockConfigureSelector).once('outside_in_qs').trigger('click');
       }
     }
diff --git a/core/modules/outside_in/src/Render/MainContent/OffCanvasRender.php b/core/modules/outside_in/src/Render/MainContent/OffCanvasRender.php
index 34cce18..9536215 100644
--- a/core/modules/outside_in/src/Render/MainContent/OffCanvasRender.php
+++ b/core/modules/outside_in/src/Render/MainContent/OffCanvasRender.php
@@ -43,7 +43,8 @@ public function renderResponse(array $main_content, Request $request, RouteMatch
 
     // Add place holder form messages from Ajax form requests.
     $main_content['off_canvas_messages'] = [
-      '#markup' => '<div class="messages__wrapper" ></div>',
+      '#type' => 'container',
+      '#attributes' => ['class' => ['messages__wrapper']],
       '#weight' => -100,
     ];