diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/doxygen/DoxygenCCommentAutoEditStrategyTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/doxygen/DoxygenCCommentAutoEditStrategyTest.java
index 2674032ed48..17f8dd94b7b 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/doxygen/DoxygenCCommentAutoEditStrategyTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/doxygen/DoxygenCCommentAutoEditStrategyTest.java
@@ -796,6 +796,21 @@ public class DoxygenCCommentAutoEditStrategyTest extends AbstractAutoEditTest {
 		assertAutoEditBehaviour();
 	}
 
+	///**X
+	//template<class T>
+	//T foo() {}
+
+	///**
+	// * X${whitespace_eol}
+	// * @tparam T
+	// * @return
+	// */
+	//template<class T>
+	//T foo() {}
+	public void testTemplateParameters_Bug562368() throws CoreException {
+		assertAutoEditBehaviour();
+	}
+
 	protected void assertAutoEditBehaviour() throws CoreException {
 		CTextTools textTools = CUIPlugin.getDefault().getTextTools();
 		final IDocument doc = new Document();
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineAutoEditStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineAutoEditStrategy.java
index db8a825826b..40329ff19f9 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineAutoEditStrategy.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineAutoEditStrategy.java
@@ -206,7 +206,7 @@ public class DoxygenMultilineAutoEditStrategy extends DefaultMultilineCommentAut
 					.append(ASTStringUtil.getSimpleName(decl.getName()))
 					.append(ASTStringUtil.getSignatureString(null, decl)).append(getLineDelimiter());
 		}
-		result.append(getBriefTag()).append(getPrePostTag()).append(documentTemplateParameters(templateParams));
+		result.append(getBriefTag()).append(getPrePostTag());
 
 		result.append(documentTemplateParameters(templateParams));
 		result.append(documentFunctionParameters(getParameterDecls(decl)));