diff --git a/firstapp/source/index.rst b/firstapp/source/index.rst
index f21e3cc7f..1990ca4d8 100644
--- a/firstapp/source/index.rst
+++ b/firstapp/source/index.rst
@@ -18,13 +18,25 @@ Contents
    networking
    advice
    craziness
-   appendix
 
+Appendix
+~~~~~~~~
+
+.. toctree::
+   :maxdepth: 1
+
+   appendix
    common/app_support.rst
+
+Glossary
+~~~~~~~~
+
+.. toctree::
+   :maxdepth: 1
+
    common/glossary.rst
 
 Search in this guide
 ~~~~~~~~~~~~~~~~~~~~
 
 * :ref:`search`
-