diff --git a/core/modules/edit/edit.module b/core/modules/edit/edit.module
index 34e8da0..331a6f5 100644
--- a/core/modules/edit/edit.module
+++ b/core/modules/edit/edit.module
@@ -55,22 +55,21 @@ function edit_toolbar() {
       '#options' => array(
         'html' => FALSE,
         'attributes' => array(
+          'id' => 'toolbar-tab-edit',
           'class' => array('icon', 'icon-edit', 'edit-nothing-editable-hidden'),
         ),
       ),
     ),
-    '#tray' => array(
-      '#attached' => array(
-        'library' => array(
-          array('edit', 'edit'),
-        ),
+    '#attached' => array(
+      'library' => array(
+        array('edit', 'edit'),
       ),
     ),
   );
 
   // Include the attachments and settings for all available editors.
   $attachments = drupal_container()->get('edit.editor.selector')->getAllEditorAttachments();
-  $tab['edit']['tray']['#attached'] = NestedArray::mergeDeep($tab['edit']['tray']['#attached'], $attachments);
+  $tab['edit']['#attached'] = NestedArray::mergeDeep($tab['edit']['#attached'], $attachments);
 
   return $tab;
 }