diff --git a/core/modules/outside_in/js/outside_in.js b/core/modules/outside_in/js/outside_in.js
index a9da40e..08ff917 100644
--- a/core/modules/outside_in/js/outside_in.js
+++ b/core/modules/outside_in/js/outside_in.js
@@ -100,10 +100,7 @@
    * Close any active toolbar tray before entering edit mode.
    */
   function closeToolbarTrays() {
-    $('#toolbar-bar')
-      .find('.toolbar-tab:not(.contextual-toolbar-tab)')
-      .has('.toolbar-tray.is-active')
-      .find('.toolbar-item').trigger('click');
+    $(Drupal.toolbar.models.toolbarModel.get('activeTab')).trigger('click');
   }
 
   /**