diff --git a/administrator/components/com_templates/helpers/html/templates.php b/administrator/components/com_templates/helpers/html/templates.php
index d44e50c70213d..bb6dd943bf70d 100644
--- a/administrator/components/com_templates/helpers/html/templates.php
+++ b/administrator/components/com_templates/helpers/html/templates.php
@@ -38,7 +38,7 @@ public static function thumb($template, $clientId = 0)
 		if (file_exists($thumb))
 		{
 			JHtml::_('bootstrap.tooltip');
-			JHtml::_('behavior.modal');
+			JHtml::_('bootstrap.modal');
 
 			$clientPath = ($clientId == 0) ? '' : 'administrator/';
 			$thumb = $clientPath . 'templates/' . $template . '/template_thumbnail.png';
@@ -47,8 +47,12 @@ public static function thumb($template, $clientId = 0)
 			if (file_exists($preview))
 			{
 				$preview = $baseUrl . '/templates/' . $template . '/template_preview.png';
-				$html = '<a href="' . $preview . '" class="thumbnail pull-left modal hasTooltip" title="' .
+				$html = '<a href="#' . $template . '-Modal" role="button" class="thumbnail pull-left hasTooltip" data-toggle="modal" title="' .
 					JHtml::tooltipText('COM_TEMPLATES_CLICK_TO_ENLARGE') . '">' . $html . '</a>';
+				$html .= JHtmlBootstrap::renderModal($template . '-Modal', array( 'url' => $preview,
+													'title' => JText::_('COM_TEMPLATES_BUTTON_PREVIEW'),
+													'height' => '800px',
+													'width' => '800px'));
 			}
 		}
 
diff --git a/administrator/components/com_templates/views/templates/tmpl/default.php b/administrator/components/com_templates/views/templates/tmpl/default.php
index 7f00e0894c5b6..600337c6a4f47 100644
--- a/administrator/components/com_templates/views/templates/tmpl/default.php
+++ b/administrator/components/com_templates/views/templates/tmpl/default.php
@@ -13,7 +13,7 @@
 JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
 
 JHtml::_('bootstrap.tooltip');
-JHtml::_('behavior.modal');
+JHtml::_('bootstrap.modal');
 JHtml::_('behavior.multiselect');
 JHtml::_('formbehavior.chosen', 'select');