diff --git a/layouts/joomla/form/field/contenthistory.php b/layouts/joomla/form/field/contenthistory.php
index 95c315610b2bd..b2a5b0db21b3e 100644
--- a/layouts/joomla/form/field/contenthistory.php
+++ b/layouts/joomla/form/field/contenthistory.php
@@ -11,6 +11,7 @@
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
 
 /**
  * Layout variables
@@ -52,7 +53,7 @@
 	'bootstrap.renderModal',
 	'versionsModal',
 	array(
-		'url'    => $link,
+		'url'    => Route::_($link),
 		'title'  => $label,
 		'height' => '100%',
 		'width'  => '100%',
diff --git a/layouts/joomla/form/field/media.php b/layouts/joomla/form/field/media.php
index 32dfdae2cc3ab..9d53c5c6fdb05 100644
--- a/layouts/joomla/form/field/media.php
+++ b/layouts/joomla/form/field/media.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
 
 /**
@@ -106,6 +107,9 @@
 		. $asset . '&author=' . $authorId)
 	. '&fieldid={field-media-id}&path=local-0:/' . $folder);
 
+// Correctly route the url to ensure it's correctly using sef modes and subfolders
+$url = Route::_($url);
+
 Factory::getDocument()->getWebAssetManager()
 	->useStyle('webcomponent.field-media')
 	->useScript('webcomponent.field-media');