2 files changed, 3 insertions, 3 deletions
diff --git a/core/modules/toolbar/js/escapeAdmin.js b/core/modules/toolbar/js/escapeAdmin.js
index 2d76991e9dc..f7956befe23 100644
--- a/core/modules/toolbar/js/escapeAdmin.js
+++ b/core/modules/toolbar/js/escapeAdmin.js
@@ -14,7 +14,7 @@
   // loaded within an existing "workflow".
   if (
     !pathInfo.currentPathIsAdmin &&
-    !/destination=/.test(windowLocation.search)
+    !windowLocation.search.includes('destination=')
   ) {
     sessionStorage.setItem('escapeAdminPath', windowLocation);
   }
diff --git a/core/modules/toolbar/js/views/ToolbarVisualView.js b/core/modules/toolbar/js/views/ToolbarVisualView.js
index 89f472f0eaf..00bd236973f 100644
--- a/core/modules/toolbar/js/views/ToolbarVisualView.js
+++ b/core/modules/toolbar/js/views/ToolbarVisualView.js
@@ -210,7 +210,7 @@
         // Deactivate the previous tab.
         $(this.model.previous('activeTab'))
           .removeClass('is-active')
-          .prop('aria-pressed', false);
+          .attr('aria-pressed', false);
         // Deactivate the previous tray.
         $(this.model.previous('activeTray')).removeClass('is-active');
 
@@ -222,7 +222,7 @@
           $tab
             .addClass('is-active')
             // Mark the tab as pressed.
-            .prop('aria-pressed', true);
+            .attr('aria-pressed', true);
           const name = $tab.attr('data-toolbar-tray');
           // Store the active tab name or remove the setting.
           const id = $tab.get(0).id;