diff --git a/core/modules/outside_in/css/outside_in.module.css b/core/modules/outside_in/css/outside_in.module.css
index 05fa72a6e5..f49da91458 100644
--- a/core/modules/outside_in/css/outside_in.module.css
+++ b/core/modules/outside_in/css/outside_in.module.css
@@ -37,10 +37,6 @@
   }
 }
 
-.ui-dialog.outside-edit-message .ui-dialog-titlebar {
-  background: inherit;
-  border: none;
-  padding: 0;
-  position: static;
-  float: right;
+#settings-tray-edit-message:empty {
+  display: none !important;
 }
diff --git a/core/modules/outside_in/js/outside_in.es6.js b/core/modules/outside_in/js/outside_in.es6.js
index 6460a308b9..dd939afd7b 100644
--- a/core/modules/outside_in/js/outside_in.es6.js
+++ b/core/modules/outside_in/js/outside_in.es6.js
@@ -131,7 +131,6 @@
     const editMsg = Drupal.t('You are now in edit mode.');
     const msgDiv = document.createElement('div');
     msgDiv.setAttribute('id', 'settings-tray-edit-message')
-    msgDiv.innerHTML = editMsg;
     Drupal.dialog(msgDiv, {
       position: {
         my: 'left+5 top+5',
@@ -141,6 +140,7 @@
       autoResize: false,
       draggable: false,
       minHeight: '50px',
+      title: editMsg,
       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 8565a584e4..abae786e20 100644
--- a/core/modules/outside_in/js/outside_in.js
+++ b/core/modules/outside_in/js/outside_in.js
@@ -75,7 +75,6 @@
     var editMsg = Drupal.t('You are now in edit mode.');
     var msgDiv = document.createElement('div');
     msgDiv.setAttribute('id', 'settings-tray-edit-message');
-    msgDiv.innerHTML = editMsg;
     Drupal.dialog(msgDiv, {
       position: {
         my: 'left+5 top+5',
@@ -85,6 +84,7 @@
       autoResize: false,
       draggable: false,
       minHeight: '50px',
+      title: editMsg,
       dialogClass: 'outside-edit-message'
     }).show();
     announce(editMsg);