diff --git a/administrator/components/com_templates/tmpl/styles/default.php b/administrator/components/com_templates/tmpl/styles/default.php
index 4f9096696ce5f..4248fa9108ad8 100644
--- a/administrator/components/com_templates/tmpl/styles/default.php
+++ b/administrator/components/com_templates/tmpl/styles/default.php
@@ -84,12 +84,13 @@
 									<?php if ($this->preview) : ?>
 										<?php $client = (int) $item->client_id === 1 ? 'administrator' : 'site'; ?>
 										<!-- external link icon generated by css -->
-										<a href="<?php echo Route::link($client, 'index.php?tp=1&templateStyle=' . (int) $item->id); ?>" target="_blank" class="jgrid"
-											title="<?php echo Text::sprintf('JBROWSERTARGET_NEW_TITLE', $item->title); ?>">
+										<a href="<?php echo Route::link($client, 'index.php?tp=1&templateStyle=' . (int) $item->id); ?>" target="_blank" class="jgrid">
 											<span class="visually-hidden"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_PREVIEW'); ?></span>
 										</a>
+										<div role="tooltip" id="preview-<?php echo (int) $item->id; ?>"><?php echo Text::sprintf('JBROWSERTARGET_NEW_TITLE', $item->title); ?></div>
 									<?php else : ?>
-										<span class="icon-eye-slash" aria-hidden="true" title="<?php echo Text::_('COM_TEMPLATES_TEMPLATE_NO_PREVIEW'); ?>"></span>
+										<span class="icon-eye-slash" aria-hidden="true"></span>
+										<div role="tooltip" id="nopreview-<?php echo (int) $item->id; ?>"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_NO_PREVIEW'); ?></div>
 										<span class="visually-hidden"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_NO_PREVIEW'); ?></span>
 									<?php endif; ?>
 								</td>
diff --git a/administrator/components/com_templates/tmpl/templates/default.php b/administrator/components/com_templates/tmpl/templates/default.php
index 97406ad078be2..670f29d73c007 100644
--- a/administrator/components/com_templates/tmpl/templates/default.php
+++ b/administrator/components/com_templates/tmpl/templates/default.php
@@ -71,11 +71,10 @@
 									<div>
 										<?php if ($this->preview) : ?>
 											<?php $client = (int) $item->client_id === 1 ? 'administrator' : 'site'; ?>
-											<a href="<?php echo Route::link($client, 'index.php?tp=1&template=' . $item->element); ?>"
-												target="_blank"
-												title="<?php echo Text::sprintf('JBROWSERTARGET_NEW_TITLE', Text::_($item->name)); ?>">
-											<?php echo Text::_('COM_TEMPLATES_TEMPLATE_PREVIEW'); ?>
+											<a href="<?php echo Route::link($client, 'index.php?tp=1&template=' . $item->element); ?> "target="_blank">
+												<?php echo Text::_('COM_TEMPLATES_TEMPLATE_PREVIEW'); ?>
 											</a>
+											<div role="tooltip" id="preview-<?php echo (int) $item->id; ?>"><?php echo Text::sprintf('JBROWSERTARGET_NEW_TITLE', $item->name); ?></div>
 										<?php else : ?>
 											<?php echo Text::_('COM_TEMPLATES_TEMPLATE_NO_PREVIEW'); ?>
 										<?php endif; ?>