diff --git a/core/modules/ckeditor/css/ckeditor.admin.css b/core/modules/ckeditor/css/ckeditor.admin.css
index f3f6dc6..ee29461 100644
--- a/core/modules/ckeditor/css/ckeditor.admin.css
+++ b/core/modules/ckeditor/css/ckeditor.admin.css
@@ -24,7 +24,6 @@
   user-select:         none;
 }
 .ckeditor-toolbar-active {
-  clear: both;
   margin-top: 0.25em;
 }
 .ckeditor-toolbar-disabled {
diff --git a/core/modules/ckeditor/js/ckeditor.admin.js b/core/modules/ckeditor/js/ckeditor.admin.js
index 8bdf736..53ad2b4 100644
--- a/core/modules/ckeditor/js/ckeditor.admin.js
+++ b/core/modules/ckeditor/js/ckeditor.admin.js
@@ -1354,18 +1354,17 @@ function openGroupNameDialog (view, $group, callback) {
         text: Drupal.t('Apply'),
         click: function () {
           closeDialog('apply', this);
-        }
+        },
+        'class': 'button-primary button'
       },
       {
         text: Drupal.t('Cancel'),
         click: function () {
           closeDialog('cancel');
-        }
+        },
+        'class': 'button'
       }
     ],
-    // Disable jQuery UI Dialog's escape handling so we can handle this
-    // ourselves, we want the 'cancel' button to be pressed.
-    closeOnEscape: false,
     open: function () {
       var form = this;
       var $form = $(this);
@@ -1388,13 +1387,6 @@ function openGroupNameDialog (view, $group, callback) {
           event.stopImmediatePropagation();
           event.preventDefault();
         }
-        // React to ESC key press.
-        else if (event.keyCode === 27) {
-          closeDialog('cancel', form);
-          event.stopPropagation();
-          event.stopImmediatePropagation();
-          event.preventDefault();
-        }
       });
       // 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.');
@@ -1404,11 +1396,6 @@ function openGroupNameDialog (view, $group, callback) {
         });
       }
       Drupal.announce(text);
-    },
-    beforeClose: false,
-    close: function (event) {
-      // Automatically destroy the DOM element that was used for the dialog.
-      $(event.target).remove();
     }
   });
   // A modal dialog is used because the user must provide a button group name