diff --git a/core/modules/outside_in/js/outside_in.js b/core/modules/outside_in/js/outside_in.js
index cb5c3cc..23a10e1 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, debounce) {
 
   'use strict';
 
@@ -123,11 +123,13 @@
    * @todo Refactor to use Javascript Message API https://www.drupal.org/node/77245
    */
   function displayEditMessage() {
+    var editMsg = Drupal.t('You are now in edit mode.');
     var msgDiv = document.createElement('div');
     msgDiv.setAttribute('class', 'settings-tray-messages messages messages--status');
     msgDiv.setAttribute('role', 'alert');
-    msgDiv.innerHTML = 'You are now in edit mode.';
+    msgDiv.innerHTML = editMsg;
     $(msgDiv).insertBefore('div.dialog-offcanvas__main-canvas').hide().fadeIn('slow');
+    Drupal.announce(editMsg);
     $(msgDiv).on('click.outsidein', function (e) {
       $(e.target).remove();
     });
@@ -151,7 +153,8 @@
       $editButton.text(Drupal.t('Editing'));
       closeToolbarTrays();
       if (displayMessage) {
-        displayEditMessage();
+        var displayFunction = debounce(displayEditMessage, 300, true);
+        displayFunction();
       }
       $editables = $('[data-drupal-outsidein="editable"]').once('outsidein');
       if ($editables.length) {
@@ -282,4 +285,4 @@
     }
   });
 
-})(jQuery, Drupal);
+})(jQuery, Drupal, Drupal.debounce);