diff --git a/core/modules/block/lib/Drupal/block/Controller/BlockController.php b/core/modules/block/lib/Drupal/block/Controller/BlockController.php
index c735ba0..0536022 100644
--- a/core/modules/block/lib/Drupal/block/Controller/BlockController.php
+++ b/core/modules/block/lib/Drupal/block/Controller/BlockController.php
@@ -30,6 +30,13 @@ public function demo($theme) {
     return array(
       '#title' => String::checkPlain($themes[$theme]->info['name']),
       '#attached' => array(
+        'js' => array(
+          array(
+            // Let JavaScript know this really is an admin page.
+            'data' => array('currentPathIsAdmin' => TRUE),
+            'type' => 'setting',
+          )
+        ),
         'library' => array(
           array('block', 'drupal.block.admin'),
         ),
diff --git a/core/modules/toolbar/js/escapeAdmin.js b/core/modules/toolbar/js/escapeAdmin.js
index d573be4..4343ce1 100644
--- a/core/modules/toolbar/js/escapeAdmin.js
+++ b/core/modules/toolbar/js/escapeAdmin.js
@@ -16,7 +16,10 @@
           $toolbarEscape
             .removeClass('toolbar-icon-home')
             .addClass('toolbar-icon-escape')
-            .attr('href', Drupal.url(escapeAdminPage))
+            .attr({
+              'href': Drupal.url(escapeAdminPage),
+              'title': Drupal.t('Return to site content')
+            })
             .text(Drupal.t('Back to site'));
 
           // Escape admin when hitting Esc key.