diff --git a/templates/base.html b/templates/base.html
index 7e24fa28..cff855a3 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -84,6 +84,12 @@
   </header>
 
   <main>
+  {% if page.taxonomies and page.taxonomies.faq %}{# Show FAQ breadcrumbs #}
+    F.A.Q. ::
+      {% for faqCategory in page.taxonomies.faq %}
+        <a href="{{ get_taxonomy_url(kind="faq", name=faqCategory) }}">{{ faqCategory }}</a>
+      {% endfor %}
+  {% endif %}
     {% block content %}{% endblock %}
   </main>
 
diff --git a/templates/faq/single.html b/templates/faq/single.html
index 5acde972..67776887 100644
--- a/templates/faq/single.html
+++ b/templates/faq/single.html
@@ -7,7 +7,6 @@
 {% block content %}
   <h1>F.A.Q. - {{ term.name }}</h1>
   {%- for faq_page in term.pages | sort(attribute="extra.order") -%}
-  <h3>{{ faq_page.title }}</h3>
-  {{ faq_page.content | safe }}
+  <h3><a href="{{ faq_page.permalink }}">{{ faq_page.title }}</a></h3>
   {%- endfor -%}
 {% endblock %}