diff --git a/core/modules/ckeditor/ckeditor.admin.inc b/core/modules/ckeditor/ckeditor.admin.inc
index 672790b..cecb7bc 100644
--- a/core/modules/ckeditor/ckeditor.admin.inc
+++ b/core/modules/ckeditor/ckeditor.admin.inc
@@ -155,7 +155,7 @@ function theme_ckeditor_settings_toolbar($variables) {
   $output .= '<legend id="ckeditor-button-configuration">' . t('Toolbar configuration') . '</legend>';
   $output .= '<div class="fieldset-wrapper">';
 
-  $output .= '<div id="ckeditor-button-description" class="fieldset-description">' . t('Move a button into the <em>Active toolbar</em> to enable it, or into the list of <em>Available buttons</em> to disable it. Buttons may be moved with the mouse or keyboard arrow keys. Empty toolbar groups will be removed upon save.') . '</div>';
+  $output .= '<div id="ckeditor-button-description" class="fieldset-description">' . t('Move a button into the <em>Active toolbar</em> to enable it, or into the list of <em>Available buttons</em> to disable it. Buttons may be moved with the mouse or keyboard arrow keys. Toolbar group names are provided to support screen reader users. Empty toolbar groups will be removed upon save.') . '</div>';
 
   $output .= '<div class="ckeditor-toolbar-disabled clearfix">';
   // Available buttons.
@@ -174,7 +174,7 @@ function theme_ckeditor_settings_toolbar($variables) {
   $output .= '</div>';
   $output .= '</div>';
   // Active toolbar.
-  $output .= '<label id="ckeditor-active-toolbar">' . t('Active toolbar') . '</label>';
+  $output .= '<div class="clearfix"><label id="ckeditor-active-toolbar">' . t('Active toolbar') . '</label></div>';
   $output .= '<div data-toolbar="active" role="form" class="ckeditor-toolbar ckeditor-toolbar-active clearfix">';
   $output .= '<ul class="ckeditor-active-toolbar-configuration" role="presentation" aria-label="' . t('CKEditor toolbar and button configuration.') . '">';
   foreach ($active_buttons as $row_number => $button_row) {
diff --git a/core/modules/ckeditor/ckeditor.module b/core/modules/ckeditor/ckeditor.module
index c1ff5a8..4202cfd 100644
--- a/core/modules/ckeditor/ckeditor.module
+++ b/core/modules/ckeditor/ckeditor.module
@@ -78,6 +78,7 @@ function ckeditor_library_info() {
       array('system', 'jquery.ui.touch-punch'),
       array('system', 'backbone'),
       array('system', 'drupal.dialog'),
+      array('system', 'drupal.announce'),
       array('ckeditor', 'ckeditor'),
       array('editor', 'drupal.editor.admin'),
       // Depend on Vertical Tabs, so that Vertical Tabs' JavaScript is executed
diff --git a/core/modules/ckeditor/css/ckeditor.admin.css b/core/modules/ckeditor/css/ckeditor.admin.css
index 64fc94e..f3f6dc6 100644
--- a/core/modules/ckeditor/css/ckeditor.admin.css
+++ b/core/modules/ckeditor/css/ckeditor.admin.css
@@ -23,6 +23,10 @@
   -ms-user-select:     none;
   user-select:         none;
 }
+.ckeditor-toolbar-active {
+  clear: both;
+  margin-top: 0.25em;
+}
 .ckeditor-toolbar-disabled {
   margin-bottom: 0.5em;
 }
@@ -43,12 +47,14 @@
   margin-top: 0.25em;
 }
 .ckeditor-toolbar-group,
-.ckeditor-toolbar-group-placeholder {
+.ckeditor-toolbar-group-placeholder,
+.ckeditor-add-new-group {
   display: inline-block;
   float: left; /* LTR */
 }
 [dir="rtl"] .ckeditor-toolbar-group,
-[dir="rtl"] .ckeditor-toolbar-group-placeholder {
+[dir="rtl"] .ckeditor-toolbar-group-placeholder,
+[dir="rtl"] .ckeditor-add-new-group {
   display: inline-block;
   float: right;
 }
@@ -59,7 +65,8 @@
   margin: 0 0.3333em;
   cursor: move;
 }
-.ckeditor-group-names-are-visible .ckeditor-toolbar-group {
+.ckeditor-group-names-are-visible .ckeditor-toolbar-group,
+.ckeditor-add-new-group {
   border: 1px dotted #a6a6a6;
   border-radius: 3px;
   padding: 0.2em 0.4em;
diff --git a/core/modules/ckeditor/js/ckeditor.admin.js b/core/modules/ckeditor/js/ckeditor.admin.js
index 995a2e2..8bdf736 100644
--- a/core/modules/ckeditor/js/ckeditor.admin.js
+++ b/core/modules/ckeditor/js/ckeditor.admin.js
@@ -466,7 +466,7 @@ Drupal.ckeditor = {
 
       // Add a toggle for the button group names.
       $(Drupal.theme('ckeditorButtonGroupNamesToggle'))
-        .insertBefore(this.$el.find('.ckeditor-toolbar-active').prev('label'));
+        .prependTo(this.$el.find('#ckeditor-active-toolbar').parent());
 
       this.render();
     },
@@ -535,6 +535,8 @@ Drupal.ckeditor = {
       function insertNewGroup (success, $group) {
         if (success) {
           $group.appendTo($(event.currentTarget).closest('.ckeditor-row').children('.ckeditor-toolbar-groups'));
+          // Focus on the new group.
+          $group.focus();
         }
       }
 
@@ -619,7 +621,7 @@ Drupal.ckeditor = {
       // Add the drag and drop functionality to button groups.
       this.$el.find('.ckeditor-toolbar-groups').not('.ui-sortable').sortable({
         connectWith: '.ckeditor-toolbar-groups',
-        cancel: '.ckeditor-toolbar-group.placeholder',
+        cancel: '.ckeditor-add-new-group',
         placeholder: 'ckeditor-toolbar-group-placeholder',
         forcePlaceholderSize: true,
         cursor: 'move',
@@ -698,8 +700,8 @@ Drupal.ckeditor = {
      */
     initialize: function () {
       // Add keyboard arrow support.
-      this.$el.on('keyup.ckeditor', '.ckeditor-buttons a, .ckeditor-multiple-buttons a', this.onPressButton.bind(this));
-      this.$el.on('keyup.ckeditor', '[data-drupal-ckeditor-type="group"]', this.onPressGroup.bind(this));
+      this.$el.on('keydown.ckeditor', '.ckeditor-buttons a, .ckeditor-multiple-buttons a', this.onPressButton.bind(this));
+      this.$el.on('keydown.ckeditor', '[data-drupal-ckeditor-type="group"]', this.onPressGroup.bind(this));
     },
 
     /**
@@ -879,7 +881,14 @@ Drupal.ckeditor = {
 
       // Respond to an enter key press.
       if (event.keyCode === 13) {
-        openGroupNameDialog(this, $(event.currentTarget));
+        var view = this;
+        // Open the group renaming dialog in the next evaluation cycle so that
+        // this event can be cancelled and the bubbling wiped out. Otherwise,
+        // Firefox has issues because the page focus is shifted to the dialog
+        // along with the keydown event.
+        window.setTimeout(function () {
+          openGroupNameDialog(view, $(event.currentTarget));
+        }, 0);
         event.preventDefault();
         event.stopPropagation();
       }
@@ -1363,7 +1372,7 @@ function openGroupNameDialog (view, $group, callback) {
       var $widget = $form.parent();
       $widget.find('.ui-dialog-titlebar-close').remove();
       // Set a click handler on the input and button in the form.
-      $widget.on('keyup.ckeditor', 'input, button', function (event) {
+      $widget.on('keypress.ckeditor', 'input, button', function (event) {
         // React to enter key press.
         if (event.keyCode === 13) {
           var $target = $(event.currentTarget);
@@ -1387,12 +1396,6 @@ function openGroupNameDialog (view, $group, callback) {
           event.preventDefault();
         }
       });
-      // Prevent the form from submitting.
-      $widget.on('keydown keypress', function (event) {
-        if (event.keyCode === 13) {
-          return false;
-        }
-      });
       // Announce to the user that a modal dialog is open.
       var text = Drupal.t('Editing the name of the new button group in a dialog.');
       if ($group.attr('data-drupal-ckeditor-toolbar-group-name') !== undefined) {