diff --git a/core/misc/tabbingmanager.js b/core/misc/tabbingmanager.js
index f212a1d..29b677b 100644
--- a/core/misc/tabbingmanager.js
+++ b/core/misc/tabbingmanager.js
@@ -41,7 +41,10 @@ $.extend(TabbingManager.prototype, {
    *
    * @return TabbingContext
    */
-  constrain: function (elements) {
+  constrain: function (elements, expand) {
+    if (typeof expand === 'undefined') {
+      expand = true;
+    }
     // Deactivate all tabbingContexts to prepare for the new constraint. A
     // tabbingContext instance will only be reactivated if the stack is unwound
     // to it in the _unwindStack() method.
@@ -51,7 +54,16 @@ $.extend(TabbingManager.prototype, {
 
     // The "active tabbing set" are the elements tabbing should be constrained
     // to.
-    var $elements = $(elements).find(':tabbable').addBack(':tabbable');
+    var $elements;
+    // Find tabbable elements within the set of supplied elements if expansion
+    // is requested.
+    if (expand) {
+      $elements = $(elements).find(':tabbable').addBack(':tabbable');
+    }
+    // Assume that a list of tabbable elements is provided.
+    else {
+      $elements = $(elements);
+    }
 
     var tabbingContext = new TabbingContext({
       // The level is the current height of the stack before this new
diff --git a/core/modules/edit/edit.module b/core/modules/edit/edit.module
index 339e255..bde8266 100644
--- a/core/modules/edit/edit.module
+++ b/core/modules/edit/edit.module
@@ -96,6 +96,7 @@ function edit_library_info() {
       $path . '/js/views/ContextualLinkView.js' => $options,
       $path . '/js/views/FieldToolbarView.js' => $options,
       $path . '/js/views/EditorView.js' => $options,
+      $path . '/js/views/FieldAuralView.js' => $options,
       // Other.
       $path . '/js/util.js' => $options,
       $path . '/js/theme.js' => $options,
@@ -112,6 +113,7 @@ function edit_library_info() {
       array('system', 'jquery.form'),
       array('system', 'jquery.ui.position'),
       array('system', 'drupal.displace'),
+      array('system', 'drupal.tabbingmanager'),
       array('system', 'drupal.form'),
       array('system', 'drupal.ajax'),
       array('system', 'drupal.debounce'),
diff --git a/core/modules/edit/js/editors/formEditor.js b/core/modules/edit/js/editors/formEditor.js
index 48827e1..80e429a 100644
--- a/core/modules/edit/js/editors/formEditor.js
+++ b/core/modules/edit/js/editors/formEditor.js
@@ -70,12 +70,18 @@ Drupal.edit.editors.form = Drupal.edit.EditorView.extend({
     // Render form container.
     var $formContainer = this.$formContainer = $(Drupal.theme('editFormContainer', {
       id: id,
+      'aria-label': Drupal.t('Edit form for @aria', {'@aria': fieldModel.get('metadata').aria}),
       loadingMsg: Drupal.t('Loading…')}
     ));
+    // Add this form's id to the list of elements that the entity owns.
+    var $entity = $(this.fieldModel.get('entity').get('el'));
+    var owns = $entity.attr('aria-owns').split(' ');
+    owns.push(id);
+    $entity.attr('aria-owns', owns.join(' '));
+    // Mark up the form with state classes.
     $formContainer
       .find('.edit-form')
-      .addClass('edit-editable edit-highlighted edit-editing')
-      .attr('role', 'dialog');
+      .addClass('edit-editable edit-highlighted edit-editing');
 
     // Insert form container in DOM.
     if (this.$el.css('display') === 'inline') {
@@ -128,6 +134,9 @@ Drupal.edit.editors.form = Drupal.edit.EditorView.extend({
           }
         });
 
+      // Set focus on the form, so that the next tab goes to the first field
+      // in this container.
+      $formContainer[0].focus();
       // The in-place editor has loaded; change state to 'active'.
       fieldModel.set('state', 'active');
     });
@@ -149,6 +158,17 @@ Drupal.edit.editors.form = Drupal.edit.EditorView.extend({
       .off('keypress.edit', 'input')
       .remove();
     this.$formContainer = null;
+    // Remove the form id from the entity's aria-owns attribute.
+    var $entity = $(this.fieldModel.get('entity').get('el'));
+    var owns = $entity
+      .attr('aria-owns')
+      .split(' ')
+      .filter(function (id) {
+        // Remove id values that start with 'edit-form-for-'.
+        return (id.indexOf('edit-form-for-') !== 0);
+      })
+      .join(' ');
+    $entity.attr('aria-owns', owns);
   },
 
   /**
diff --git a/core/modules/edit/js/theme.js b/core/modules/edit/js/theme.js
index 0306ff4..001a2c2 100644
--- a/core/modules/edit/js/theme.js
+++ b/core/modules/edit/js/theme.js
@@ -32,7 +32,7 @@ Drupal.theme.editBackstage = function (settings) {
  */
 Drupal.theme.editEntityToolbar = function (settings) {
   var html = '';
-  html += '<div id="' + settings.id + '" class="edit edit-toolbar-container clearfix">';
+  html += '<div id="' + settings.id + '" class="edit edit-toolbar-container clearfix" role="dialog">';
   html += '<i class="edit-toolbar-pointer"></i>';
   html += '<div class="edit-toolbar-content">';
   html += '<div class="edit-toolbar edit-toolbar-entity clearfix icon icon-pencil">';
@@ -154,7 +154,7 @@ Drupal.theme.editButtons = function (settings) {
  */
 Drupal.theme.editFormContainer = function (settings) {
   var html = '';
-  html += '<div id="' + settings.id + '" class="edit-form-container">';
+  html += '<div id="' + settings.id + '" class="edit-form-container" role="dialog" tabindex="0" aria-label="' + settings['aria-label'] + '">';
   html += '  <div class="edit-form">';
   html += '    <div class="placeholder">';
   html +=        settings.loadingMsg;
diff --git a/core/modules/edit/js/views/AppView.js b/core/modules/edit/js/views/AppView.js
index 6e1ed41..87aca18 100644
--- a/core/modules/edit/js/views/AppView.js
+++ b/core/modules/edit/js/views/AppView.js
@@ -80,6 +80,12 @@ Drupal.edit.AppView = Backbone.View.extend({
           entityModel.set('state', 'opening');
         });
         break;
+      case 'opened':
+        // Constrain the tabbing context.
+        if (!app.tabbingContext) {
+          app.tabbingContext = Drupal.tabbingManager.constrain($('.edit-editable, #edit-entity-toolbar .edit-toolbar button'), false);
+        }
+        break;
       case 'closed':
         entityToolbarView = entityModel.toolbarView;
         // First, tear down the in-place editors.
@@ -91,6 +97,11 @@ Drupal.edit.AppView = Backbone.View.extend({
           entityToolbarView.remove();
           delete entityModel.toolbarView;
         }
+        // Release the tabbing context.
+        if (app.tabbingContext) {
+          app.tabbingContext.release();
+          app.tabbingContext = null;
+        }
         // A page reload may be necessary to re-instate the original HTML of the
         // edited fields.
         if (reload) {
@@ -252,11 +263,17 @@ Drupal.edit.AppView = Backbone.View.extend({
     var editorName = fieldModel.get('metadata').editor;
     var editorModel = new Drupal.edit.EditorModel();
     var editorView = new Drupal.edit.editors[editorName]({
-      el: $(fieldModel.get('el')),
+      el: fieldModel.get('el'),
       model: editorModel,
       fieldModel: fieldModel
     });
 
+    // Create the in-place editor's aural view — for screen reader support.
+    var fieldAuralView = new Drupal.edit.FieldAuralView({
+      el: fieldModel.get('el'),
+      model: fieldModel
+    });
+
     // Create in-place editor's toolbar — positions appropriately above the
     // edited element.
     var toolbarView = new Drupal.edit.FieldToolbarView({
@@ -280,6 +297,7 @@ Drupal.edit.AppView = Backbone.View.extend({
     fieldModel.editorView = editorView;
     fieldModel.toolbarView = toolbarView;
     fieldModel.decorationView = decorationView;
+    fieldModel.fieldAuralView = fieldAuralView;
   },
 
   /**
@@ -309,6 +327,10 @@ Drupal.edit.AppView = Backbone.View.extend({
     // because that would remove the field itself.
     fieldModel.editorView.remove();
     delete fieldModel.editorView;
+
+    // Unbind event handlers; delete aural view.
+    fieldModel.fieldAuralView.remove();
+    delete fieldModel.fieldAuralView;
   },
 
   /**
diff --git a/core/modules/edit/js/views/EditorDecorationView.js b/core/modules/edit/js/views/EditorDecorationView.js
index 1e76ad3..ca78a52 100644
--- a/core/modules/edit/js/views/EditorDecorationView.js
+++ b/core/modules/edit/js/views/EditorDecorationView.js
@@ -11,11 +11,12 @@ Drupal.edit.EditorDecorationView = Backbone.View.extend({
   _widthAttributeIsEmpty: null,
 
   events: {
-    'mouseenter.edit' : 'onMouseEnter',
-    'mouseleave.edit' : 'onMouseLeave',
-    'click': 'onClick',
-    'tabIn.edit': 'onMouseEnter',
-    'tabOut.edit': 'onMouseLeave'
+    'mouseenter.edit' : 'highlight',
+    'mouseleave.edit' : 'dehighlight',
+    'click': 'activate',
+    'keypress': 'activate',
+    'focus': 'highlight',
+    'blur': 'dehighlight'
   },
 
   /**
@@ -30,6 +31,9 @@ Drupal.edit.EditorDecorationView = Backbone.View.extend({
 
     this.model.on('change:state', this.stateChange, this);
     this.model.on('change:isChanged change:inTempStore', this.renderChanged, this);
+
+    // Manage keyboard clicks.
+    //this.$el.on('keypress.edit', this.onKeyPress.bind(this));
   },
 
   /**
@@ -105,11 +109,11 @@ Drupal.edit.EditorDecorationView = Backbone.View.extend({
   },
 
   /**
-   * Starts hover; transitions to 'highlight' state.
+   * Transitions to 'highlight' state.
    *
    * @param jQuery event
    */
-  onMouseEnter: function (event) {
+  highlight: function (event) {
     var that = this;
     that.model.set('state', 'highlighted');
     event.stopPropagation();
@@ -120,7 +124,7 @@ Drupal.edit.EditorDecorationView = Backbone.View.extend({
    *
    * @param jQuery event
    */
-  onMouseLeave: function (event) {
+  dehighlight: function (event) {
     var that = this;
     that.model.set('state', 'candidate', { reason: 'mouseleave' });
     event.stopPropagation();
@@ -131,7 +135,7 @@ Drupal.edit.EditorDecorationView = Backbone.View.extend({
    *
    * @param jQuery event
    */
-  onClick: function (event) {
+  activate: function (event) {
     this.model.set('state', 'activating');
     event.preventDefault();
     event.stopPropagation();
@@ -141,14 +145,26 @@ Drupal.edit.EditorDecorationView = Backbone.View.extend({
    * Adds classes used to indicate an elements editable state.
    */
   decorate: function () {
-    this.$el.addClass('edit-candidate edit-editable');
+    this.$el
+      // Mark the view's element as editable.
+      .addClass('edit-candidate edit-editable')
+      // Mark the element as tabbable.
+      .prop({'tabIndex': '0'})
+      .attr({
+        'role': 'button',
+        'aria-label': Drupal.t('Quick edit field @label', {'@label': this.model.get('metadata').label})
+      });
   },
 
   /**
    * Removes classes used to indicate an elements editable state.
    */
   undecorate: function () {
-    this.$el.removeClass('edit-candidate edit-editable edit-highlighted edit-editing');
+    this.$el
+      .removeClass('edit-candidate edit-editable edit-highlighted edit-editing')
+      // Remove the tabindex to make the element untabbable.
+      .prop('tabIndex', '-1')
+      .removeAttr('role aria-label');
   },
 
   /**
diff --git a/core/modules/edit/js/views/EntityToolbarView.js b/core/modules/edit/js/views/EntityToolbarView.js
index a2998db..628fe69 100644
--- a/core/modules/edit/js/views/EntityToolbarView.js
+++ b/core/modules/edit/js/views/EntityToolbarView.js
@@ -65,8 +65,8 @@ Drupal.edit.EntityToolbarView = Backbone.View.extend({
       if ($body.children('#edit-entity-toolbar').length === 0) {
         $body.append(this.$el);
       }
-      // The fence will define a area on the screen that the entity toolbar
-      // will be position within.
+      // The fence will define an area on the screen that the entity toolbar
+      // will be positioned within.
       if ($body.children('#edit-toolbar-fence').length === 0) {
         this.$fence = $(Drupal.theme('editEntityToolbarFence'))
           .css(Drupal.displace())
@@ -325,12 +325,17 @@ Drupal.edit.EntityToolbarView = Backbone.View.extend({
             type: 'submit',
             classes: 'action-save edit-button icon',
             attributes: {
-              'aria-hidden': true
+              'aria-hidden': true,
+              'tabindex': '0'
             }
           },
           {
             label: Drupal.t('Close'),
-            classes: 'action-cancel edit-button icon icon-close icon-only'
+            classes: 'action-cancel edit-button icon icon-close icon-only',
+            attributes: {
+              'tabindex': '0',
+              'aria-label': Drupal.t('Cancel in-place editing')
+            }
           }
         ]
       }));
@@ -387,9 +392,17 @@ Drupal.edit.EntityToolbarView = Backbone.View.extend({
       label = entityLabel;
     }
 
+    // Label the toolbar.
     this.$el
+      .attr('aria-label', Drupal.t('Quick edit controls for @entity', {'@entity': entityLabel}))
       .find('.edit-toolbar-label')
       .html(label);
+
+    // Label the save button so that it has context.
+    var changeFieldsCount = this.model.get('fields').where({isChanged: true}).length;
+    this.$el
+      .find('.edit-toolbar-entity [type="submit"]')
+      .attr('aria-label', Drupal.t('Save changes to @fields', {'@fields': Drupal.formatPlural(changeFieldsCount, '@count field', '@count fields')}));
   },
 
   /**
diff --git a/core/modules/edit/js/views/EntityView.js b/core/modules/edit/js/views/EntityView.js
index a2e771a..308701b 100644
--- a/core/modules/edit/js/views/EntityView.js
+++ b/core/modules/edit/js/views/EntityView.js
@@ -3,6 +3,7 @@
 "use strict";
 
 Drupal.edit.EntityView = Backbone.View.extend({
+
   /**
    * {@inheritdoc}
    *
@@ -16,15 +17,62 @@ Drupal.edit.EntityView = Backbone.View.extend({
    * {@inheritdoc}
    */
   render: function () {
-    this.$el.toggleClass('edit-entity-active', this.model.get('isActive'));
+    var isActive = this.model.get('isActive');
+    this.$el.toggleClass('edit-entity-active', isActive);
+
+    // If the entity has a role, remember it and change the role to form.
+    if (isActive && !this.attrs) {
+      this.attrs = {
+        'role': this.$el.attr('role'),
+        'aria-label': this.$el.attr('aria-label'),
+        'aria-owns': this.$el.attr('aria-owns')
+      };
+      this.$el.attr({
+        'role': 'form',
+        'aria-label': Drupal.t('@entity', {'@entity': this.model.get('label')}),
+        'aria-owns': 'edit-entity-toolbar' // @todo need to add the field edit form when one is created.
+      });
+    }
+
+    // Revert to the original role if the entity has been deactivated.
+    if (!isActive && this.model.previous('isActive')) {
+      this.revertAttrs();
+    }
   },
 
   /**
    * {@inheritdoc}
    */
   remove: function () {
+    this.revertAttrs();
+    this.$el.off('.edit');
+
+    // The element must be set to null or the entity will be removed from the
+    // DOM.
     this.setElement(null);
     Backbone.View.prototype.remove.call(this);
+  },
+
+  /**
+   * Reverts the role attribute of the entity element to the original value.
+   */
+  revertAttrs: function () {
+    // Replace any attributes that might have been changed.
+    if (this.attrs) {
+      for (var name in this.attrs) {
+        if (this.attrs.hasOwnProperty(name)) {
+          if (this.attrs[name]) {
+            this.$el.attr(name, this.attrs[name]);
+          }
+          // If the element did not have this attribute originally, then just
+          // delete it.
+          else {
+            this.$el.removeAttr(name);
+          }
+        }
+      }
+      this.attrs = null;
+    }
   }
 });
 
diff --git a/core/modules/edit/js/views/FieldAuralView.js b/core/modules/edit/js/views/FieldAuralView.js
new file mode 100644
index 0000000..ae896c4
--- /dev/null
+++ b/core/modules/edit/js/views/FieldAuralView.js
@@ -0,0 +1,72 @@
+/**
+ * @file
+ * A Backbone View that adds screen reader support to in-place editors.
+ */
+(function (Backbone, Drupal) {
+
+"use strict";
+
+/**
+ * Reacts to field model changes by announcing the changes in a way that screen
+ * reading user agents will convey.
+ */
+Drupal.edit.FieldAuralView = Backbone.View.extend({
+
+  /**
+   * {@inheritdoc}
+   */
+  initialize: function () {
+    this.model.on('change:state', this.stateChange, this);
+  },
+
+  /**
+   * {@inheritdoc}
+   */
+  remove: function () {
+    // The el property is the field, which should not be removed. Remove the
+    // pointer to it, then call Backbone.View.prototype.remove().
+    this.setElement();
+    Backbone.View.prototype.remove.call(this);
+  },
+
+  /**
+   * Determines the actions to take given a change of state.
+   *
+   * @param Drupal.edit.FieldModel fieldModel
+   * @param String state
+   *   The state of the associated field. One of Drupal.edit.FieldModel.states.
+   */
+  stateChange: function (fieldModel, state) {
+    var to = state;
+    switch (to) {
+      case 'active':
+        // The user can now actually use the in-place editor.
+        this.announceActiveEditor();
+        break;
+      case 'invalid':
+        // The modified field value was attempted to be saved, but there were
+        // validation errors.
+        this.announceValidationErrors();
+        break;
+    }
+  },
+
+  /**
+   * Announces details of the field being edited in place.
+   */
+  announceActiveEditor: function () {
+    Drupal.announce(Drupal.t('Editing @field', {'@field': this.model.get('metadata').aria}), 'assertive');
+  },
+
+  /**
+   * Announces validation error messages to a screen reading user agent.
+   */
+  announceValidationErrors: function () {
+    var errors = this.model.get('validationErrors');
+    // @todo, announce the validation errors. And mark them correctly with
+    // aria-invalid=true
+  }
+
+});
+
+}(Backbone, Drupal));