diff --git a/administrator/components/com_templates/views/template/tmpl/default_modal_collapse_body.php b/administrator/components/com_templates/views/template/tmpl/default_modal_collapse_body.php
index 62e6167b099e6..160bc7841a4fb 100644
--- a/administrator/components/com_templates/views/template/tmpl/default_modal_collapse_body.php
+++ b/administrator/components/com_templates/views/template/tmpl/default_modal_collapse_body.php
@@ -8,10 +8,14 @@
  */
 
 defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip', '.modalTooltip', array('container' => '#collapseModal'));
 ?>
 <div id="template-manager-css" class="form-horizontal">
-	<div class="control-group">
-		<label for="new_name" class="control-label hasTooltip" title="<?php echo JHtml::tooltipText('COM_TEMPLATES_TEMPLATE_NEW_NAME_DESC'); ?>"><?php echo JText::_('COM_TEMPLATES_TEMPLATE_NEW_NAME_LABEL')?></label>
+	<div class="control-group span6">
+		<label for="new_name" class="modalTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_TEMPLATES_TEMPLATE_NEW_NAME_LABEL', 'COM_TEMPLATES_TEMPLATE_NEW_NAME_DESC'); ?>">
+			<?php echo JText::_('COM_TEMPLATES_TEMPLATE_NEW_NAME_LABEL')?>
+		</label>
 		<div class="controls">
 			<input class="input-xlarge" type="text" id="new_name" name="new_name"  />
 		</div>
diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index 70262d6168ccb..7791cf50a93e9 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -217,7 +217,7 @@ COM_TEMPLATES_TEMPLATE_FILENAME="Editing file &quot;%s&quot; in template &quot;%
 COM_TEMPLATES_TEMPLATE_FILES="Template Files"
 COM_TEMPLATES_TEMPLATE_HTML="HTML files"
 COM_TEMPLATES_TEMPLATE_MASTER_FILES="Template Master Files"
-COM_TEMPLATES_TEMPLATE_NEW_NAME_DESC="New Template Name::Enter the name of the new template. Please use letters, numbers and underscore only."
+COM_TEMPLATES_TEMPLATE_NEW_NAME_DESC="Enter the name of the new template. Please use letters, numbers and underscore only."
 COM_TEMPLATES_TEMPLATE_NEW_NAME_LABEL="New Template Name"
 COM_TEMPLATES_TEMPLATE_NO_PREVIEW="No preview available. You can enable preview in the options."
 COM_TEMPLATES_TEMPLATE_NO_PREVIEW_ADMIN="No preview available for Administrator templates"