diff --git a/core/modules/media/js/plugins/drupalmedia/plugin.es6.js b/core/modules/media/js/plugins/drupalmedia/plugin.es6.js
index ef7ea3f9b5..94a5f8da6c 100644
--- a/core/modules/media/js/plugins/drupalmedia/plugin.es6.js
+++ b/core/modules/media/js/plugins/drupalmedia/plugin.es6.js
@@ -337,7 +337,13 @@
           const editButton = CKEDITOR.dom.element.createFromHtml(
             Drupal.theme('mediaEmbedEditButton'),
           );
-          embeddedMedia.getFirst().insertBeforeMe(editButton);
+
+          if (embeddedMedia.getFirst(isElementNode)) {
+            embeddedMedia.getFirst(isElementNode).insertBeforeMe(editButton);
+          }
+          else {
+            embeddedMedia.insertBeforeMe(editButton);
+          }
 
           // Make the edit button do things.
           const widget = this;
diff --git a/core/modules/media/js/plugins/drupalmedia/plugin.js b/core/modules/media/js/plugins/drupalmedia/plugin.js
index 7061bf8144..adc8f7d9d0 100644
--- a/core/modules/media/js/plugins/drupalmedia/plugin.js
+++ b/core/modules/media/js/plugins/drupalmedia/plugin.js
@@ -239,7 +239,12 @@
           embeddedMedia.setStyle('position', 'relative');
 
           var editButton = CKEDITOR.dom.element.createFromHtml(Drupal.theme('mediaEmbedEditButton'));
-          embeddedMedia.getFirst().insertBeforeMe(editButton);
+
+          if (embeddedMedia.getFirst(isElementNode)) {
+            embeddedMedia.getFirst(isElementNode).insertBeforeMe(editButton);
+          } else {
+            embeddedMedia.insertBeforeMe(editButton);
+          }
 
           var widget = this;
           this.element.findOne('.media-library-item__edit').on('click', function (event) {
@@ -330,4 +335,4 @@
       linkCommandIntegrator(editor);
     }
   });
-})(jQuery, Drupal, CKEDITOR);
\ No newline at end of file
+})(jQuery, Drupal, CKEDITOR);
diff --git a/core/modules/media/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php b/core/modules/media/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
index 1a0e7201d4..983b46d63f 100644
--- a/core/modules/media/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
+++ b/core/modules/media/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
@@ -93,6 +93,7 @@ protected function setUp() {
         'filter_align' => ['status' => TRUE],
         'filter_caption' => ['status' => TRUE],
         'media_embed' => ['status' => TRUE],
+        'filter_autop' => ['status' => TRUE],
       ],
     ])->save();
     Editor::create([