diff --git a/core/modules/media_library/css/media_library.theme.css b/core/modules/media_library/css/media_library.theme.css
index 51bbb2295e..bc5602d1a5 100644
--- a/core/modules/media_library/css/media_library.theme.css
+++ b/core/modules/media_library/css/media_library.theme.css
@@ -243,17 +243,6 @@
   margin: 0;
 }
 
-.media-library-item--grid .views-field-operations {
-  height: 30px;
-}
-
-.media-library-item--grid .views-field-operations .dropbutton-wrapper {
-  position: absolute;
-  right: 5px;
-  bottom: 5px;
-  display: inline-block;
-}
-
 /* Media library item table styles. */
 .media-library-item--table img {
   max-width: 100px;
diff --git a/core/modules/media_library/js/media_library.ui.es6.js b/core/modules/media_library/js/media_library.ui.es6.js
index dc259d6def..eee0979531 100644
--- a/core/modules/media_library/js/media_library.ui.es6.js
+++ b/core/modules/media_library/js/media_library.ui.es6.js
@@ -166,8 +166,8 @@
           e.stopPropagation();
 
           const $link = $(e.currentTarget);
-          const displayAnnouncement = $link.data('display-announcement');
-          const loadingAnnouncement = $link.data('loading-announcement');
+          const displayAnnouncement = $link.data('ajax-display-announcement');
+          const loadingAnnouncement = $link.data('ajax-loading-announcement');
 
           // Replace the library view.
           const ajaxObject = Drupal.ajax({
@@ -184,7 +184,7 @@
           // to screen readers.
           if (displayAnnouncement) {
             const success = ajaxObject.success;
-            ajaxObject.success = function (response, status) {
+            ajaxObject.success = function(response, status) {
               success.bind(this)(response, status);
               // The AJAX link replace the whole view, including the clicked
               // link. Move the focus back to the clicked link when the view is
diff --git a/core/modules/media_library/js/media_library.ui.js b/core/modules/media_library/js/media_library.ui.js
index e746edfde9..baaaac9271 100644
--- a/core/modules/media_library/js/media_library.ui.js
+++ b/core/modules/media_library/js/media_library.ui.js
@@ -82,8 +82,8 @@
         e.stopPropagation();
 
         var $link = $(e.currentTarget);
-        var displayAnnouncement = $link.data('display-announcement');
-        var loadingAnnouncement = $link.data('loading-announcement');
+        var displayAnnouncement = $link.data('ajax-display-announcement');
+        var loadingAnnouncement = $link.data('ajax-loading-announcement');
 
         var ajaxObject = Drupal.ajax({
           wrapper: 'media-library-view',
diff --git a/core/modules/media_library/media_library.module b/core/modules/media_library/media_library.module
index 7d3c4265c7..e919a92ebe 100644
--- a/core/modules/media_library/media_library.module
+++ b/core/modules/media_library/media_library.module
@@ -5,7 +5,6 @@
  * Contains hook implementations for the media_library module.
  */
 
-use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
@@ -21,7 +20,6 @@
 use Drupal\media\MediaTypeForm;
 use Drupal\media\MediaTypeInterface;
 use Drupal\media_library\Form\FileUploadForm;
-use Drupal\media_library\MediaLibraryState;
 use Drupal\views\Form\ViewsForm;
 use Drupal\views\Plugin\views\cache\CachePluginBase;
 use Drupal\views\ViewExecutable;
@@ -99,12 +97,12 @@ function media_library_link_alter(&$variables) {
     // @todo Replace the custom announcements when
     //   https://www.drupal.org/project/drupal/issues/2973140 is in.
     if ($options['target_display_id'] === 'widget') {
-      $options['attributes']['data-display-announcement'] = t('Changed to grid view.');
-      $options['attributes']['data-loading-announcement'] = t('Loading grid view.');
+      $options['attributes']['data-ajax-display-announcement'] = t('Changed to grid view.');
+      $options['attributes']['data-ajax-loading-announcement'] = t('Loading grid view.');
     }
-    if ($options['target_display_id'] === 'widget_table') {
-      $options['attributes']['data-display-announcement'] = t('Changed to table view.');
-      $options['attributes']['data-loading-announcement'] = t('Loading table view.');
+    elseif ($options['target_display_id'] === 'widget_table') {
+      $options['attributes']['data-ajax-display-announcement'] = t('Changed to table view.');
+      $options['attributes']['data-ajax-loading-announcement'] = t('Loading table view.');
     }
   }
 }
diff --git a/core/modules/media_library/tests/src/FunctionalJavascript/MediaLibraryTest.php b/core/modules/media_library/tests/src/FunctionalJavascript/MediaLibraryTest.php
index bdd0c211be..acaec03b4b 100644
--- a/core/modules/media_library/tests/src/FunctionalJavascript/MediaLibraryTest.php
+++ b/core/modules/media_library/tests/src/FunctionalJavascript/MediaLibraryTest.php
@@ -285,6 +285,8 @@ public function testWidget() {
     $assert_session->buttonNotExists('Apply filters', $button_pane);
     $page->hasLink('Show as grid');
     $page->clickLink('Show as table');
+    $assert_session->waitForText('Loading table view.');
+    $assert_session->waitForText('Changed to table view.');
     $assert_session->waitForElementVisible('css', '.media-library-view .media-library-item--table');
     $assert_session->elementNotExists('css', '.media-library-view .media-library-item--grid');
     $assert_session->buttonExists('Select media', $button_pane);
@@ -297,6 +299,8 @@ public function testWidget() {
     $assert_session->pageTextNotContains('Turtle');
     $page->hasLink('Show as table');
     $page->clickLink('Show as grid');
+    $assert_session->waitForText('Loading grid view.');
+    $assert_session->waitForText('Changed to grid view.');
     $assert_session->waitForElementVisible('css', '.media-library-view .media-library-item--grid');
     $assert_session->elementNotExists('css', '.media-library-view .media-library-item--table');
     $assert_session->pageTextContains('Dog');