diff --git a/core/data/System/FAQViewTemplate.txt b/core/data/System/FAQViewTemplate.txt
index 100b980e4b..de07d796ae 100644
--- a/core/data/System/FAQViewTemplate.txt
+++ b/core/data/System/FAQViewTemplate.txt
@@ -9,12 +9,8 @@
     same way
 
 }%%TMPL:DEF{"content"}%
----++ FAQ:
-
-%FORMFIELD{"TopicSummary"}%
-
----++ Answer:
-
+---+ Question: %FORMFIELD{"TopicSummary"}%
+---++ Answer
 %TEXT%
 
 *Back to:* [[%SYSTEMWEB%.%FORMFIELD{"TopicClassification"}%][%FORMFIELD{"TopicClassification"}%]]