diff --git a/core/modules/outside_in/css/outside_in.module.css b/core/modules/outside_in/css/outside_in.module.css
index f9c86c8ca2..05fa72a6e5 100644
--- a/core/modules/outside_in/css/outside_in.module.css
+++ b/core/modules/outside_in/css/outside_in.module.css
@@ -40,9 +40,7 @@
 .ui-dialog.outside-edit-message .ui-dialog-titlebar {
   background: inherit;
   border: none;
-}
-
-.ui-dialog.outside-edit-message .ui-dialog-titlebar {
   padding: 0;
+  position: static;
+  float: right;
 }
-
diff --git a/core/modules/outside_in/js/outside_in.es6.js b/core/modules/outside_in/js/outside_in.es6.js
index 4aee4e201b..6460a308b9 100644
--- a/core/modules/outside_in/js/outside_in.es6.js
+++ b/core/modules/outside_in/js/outside_in.es6.js
@@ -1,6 +1,10 @@
 /**
  * @file
  * Drupal's Settings Tray library.
+ *
+ * The Drupal.t() function is used in this file but cannot be destructed here
+ * aliased because Javascript files are scanned for calls to Drupal.t().
+ * @todo Destructure Drupal.t() if in possilbe in https://www.drupal.org/node/2893361
  */
 (function ($, { announce, ajax, attachBehaviors, toolbar, behaviors }) {
   const blockConfigureSelector = '[data-outside-in-edit]';
@@ -136,6 +140,7 @@
       },
       autoResize: false,
       draggable: false,
+      minHeight: '50px',
       dialogClass: 'outside-edit-message',
     }).show();
     announce(editMsg);
diff --git a/core/modules/outside_in/js/outside_in.js b/core/modules/outside_in/js/outside_in.js
index 5f02e968c4..8565a584e4 100644
--- a/core/modules/outside_in/js/outside_in.js
+++ b/core/modules/outside_in/js/outside_in.js
@@ -84,6 +84,7 @@
       },
       autoResize: false,
       draggable: false,
+      minHeight: '50px',
       dialogClass: 'outside-edit-message'
     }).show();
     announce(editMsg);
diff --git a/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php b/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php
index 9a6e166588..3daa9344d3 100644
--- a/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php
+++ b/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php
@@ -479,7 +479,7 @@ public function getBlockSelector(Block $block) {
    *  Also waits for the dialog to be removed from the page.
    */
   protected function closeMessageDialog() {
-    if ($message_dialog_close_button = $this->assertSession()->waitForElementVisible('css', '[aria-describedby="settings-tray-edit-message"] .ui-dialog-titlebar-close')) {
+    if ($message_dialog_close_button = $this->assertSession()->waitForElementVisible('css', '[aria-describedby="settings-tray-edit-message"]')) {
       $message_dialog_close_button->click();
       $this->waitForNoElement('css', '[aria-describedby="settings-tray-edit-message"]');
     }