diff --git a/tildes/tildes/templates/group_wiki_page.jinja2 b/tildes/tildes/templates/group_wiki_page.jinja2
index 690e27f..48f6042 100644
--- a/tildes/tildes/templates/group_wiki_page.jinja2
+++ b/tildes/tildes/templates/group_wiki_page.jinja2
@@ -42,8 +42,13 @@
 <ul class="nav">
   <li>Page list</li>
   <ul class="nav">
+  {% if page_list|selectattr("page_name", "eq", "index")|list %}
+    <li class="nav-item"><a href="{{ request.route_url("group_wiki_page", group_path=page.group.path, wiki_page_slug="index") }}" class="text-bold">index</a></li>
+  {% endif %}
   {% for other_page in page_list %}
+    {% if other_page.page_name != "index" %}
     <li class="nav-item"><a href="{{ request.route_url("group_wiki_page", group_path=other_page.group.path, wiki_page_slug=other_page.slug) }}">{{ other_page.page_name }}</a></li>
+    {% endif %}
   {% endfor %}
   </ul>
 </ul>
diff --git a/tildes/tildes/templates/topic_listing.jinja2 b/tildes/tildes/templates/topic_listing.jinja2
index ac8c3bc..703c2f3 100644
--- a/tildes/tildes/templates/topic_listing.jinja2
+++ b/tildes/tildes/templates/topic_listing.jinja2
@@ -228,8 +228,13 @@
     <ul class="nav">
       <li>Group wiki pages</li>
       <ul class="nav">
+      {% if wiki_pages|selectattr("page_name", "eq", "index")|list %}
+        <li class="nav-item"><a href="{{ request.route_url("group_wiki_page", group_path=group.path, wiki_page_slug="index") }}" class="text-bold">index</a></li>
+      {% endif %}
       {% for page in wiki_pages %}
+        {% if page.page_name != "index" %}
         <li class="nav-item"><a href="{{ request.route_url("group_wiki_page", group_path=group.path, wiki_page_slug=page.slug) }}">{{ page.page_name }}</a></li>
+        {% endif %}
       {% endfor %}
       </ul>
     </ul>