diff --git a/core/modules/settings_tray/js/settings_tray.es6.js b/core/modules/settings_tray/js/settings_tray.es6.js
index b445992de1..26c335ea49 100644
--- a/core/modules/settings_tray/js/settings_tray.es6.js
+++ b/core/modules/settings_tray/js/settings_tray.es6.js
@@ -76,7 +76,7 @@
     if ($('#settings-tray-edit-message').length) {
       return;
     }
-    const editMsg = Drupal.t('You are now in edit mode.');
+    const editMsg = Drupal.t('Click a page element to edit it.');
     const msgDiv = document.createElement('div');
     msgDiv.setAttribute('id', 'settings-tray-edit-message')
     Drupal.dialog(msgDiv, {
diff --git a/core/modules/settings_tray/js/settings_tray.js b/core/modules/settings_tray/js/settings_tray.js
index ab59077f61..b16a7d6939 100644
--- a/core/modules/settings_tray/js/settings_tray.js
+++ b/core/modules/settings_tray/js/settings_tray.js
@@ -45,7 +45,7 @@
     if ($('#settings-tray-edit-message').length) {
       return;
     }
-    var editMsg = Drupal.t('You are now in edit mode.');
+    var editMsg = Drupal.t('Click a page element to edit it.');
     var msgDiv = document.createElement('div');
     msgDiv.setAttribute('id', 'settings-tray-edit-message');
     Drupal.dialog(msgDiv, {
diff --git a/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayBlockFormTest.php b/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayBlockFormTest.php
index 8b11c8d152..454158e047 100644
--- a/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayBlockFormTest.php
+++ b/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayBlockFormTest.php
@@ -416,7 +416,7 @@ protected function assertEditModeEnabled() {
     $web_assert->elementContains('css', static::TOOLBAR_EDIT_LINK_SELECTOR, 'Editing');
     // The main canvas element should have the "js-settings-tray-edit-mode" class.
     $web_assert->elementExists('css', '.dialog-off-canvas__main-canvas.js-settings-tray-edit-mode');
-    $web_assert->elementTextContains('css', '.settings-tray-edit-message', 'You are now in edit mode');
+    $web_assert->elementTextContains('css', '.settings-tray-edit-message', 'Click a page element to edit it');
     $this->closeMessageDialog();
   }