diff --git a/administrator/templates/atum/scss/template.scss b/administrator/templates/atum/scss/template.scss
index f246fc0438458..2191617a84f60 100644
--- a/administrator/templates/atum/scss/template.scss
+++ b/administrator/templates/atum/scss/template.scss
@@ -114,4 +114,4 @@
 // Quickicon specific
 .message-alert {
   text-align: right !important;
-}
\ No newline at end of file
+}
diff --git a/build/media_source/system/js/fields/joomla-field-media.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-media.w-c.es6.js
index 18c10337911db..4c188a5d70644 100644
--- a/build/media_source/system/js/fields/joomla-field-media.w-c.es6.js
+++ b/build/media_source/system/js/fields/joomla-field-media.w-c.es6.js
@@ -185,7 +185,7 @@
     }
 
     show() {
-      this.querySelector('[role="dialog"]').open();
+      $('#' + this.querySelector('[role="dialog"]').id).modal('show');
 
       this.querySelector(this.buttonSaveSelected).addEventListener('click', this.onSelected);
     }
@@ -194,7 +194,7 @@
       const input = this.querySelector(this.input);
       Joomla.getImage(Joomla.selectedFile, input, this);
 
-      Joomla.Modal.getCurrent().close();
+      $('#' + $('.modal.fade.in')[0].getAttribute('id')).modal('hide');
     }
 
     setValue(value) {
diff --git a/layouts/joomla/modal/body.php b/layouts/joomla/modal/body.php
index 74b38a0b1b71b..fb968556c157c 100644
--- a/layouts/joomla/modal/body.php
+++ b/layouts/joomla/modal/body.php
@@ -9,6 +9,8 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\Layout\LayoutHelper;
+
 extract($displayData);
 
 /**
@@ -42,5 +44,6 @@
 }
 ?>
 <div class="<?php echo $bodyClass; ?>">
+	<?php echo LayoutHelper::render('joomla.modal.iframe', $displayData); ?>
 	<?php echo $body; ?>
 </div>