diff --git a/templates/main.html b/templates/main.html
index a09493b3..6fc2140c 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -29,8 +29,8 @@
     </ul>
     <h2>Wiki</h2>
     <ul>
-        {% for key in wiki_pages %}
-            <li><a href="wiki/{{ key }}">{{ key }}</a></li>
+        {% for page in wiki_pages %}
+            <li><a href="wiki/{{ page.key }}">{{ page.key }}</a></li>
         {% endfor %}
     </ul>
 {% endblock %}
\ No newline at end of file
diff --git a/webserver.py b/webserver.py
index a19734d7..363b1102 100644
--- a/webserver.py
+++ b/webserver.py
@@ -24,8 +24,9 @@ def page_main():
     if fl_session.get("user_id"):
         db_session = db.Session()
         royals = db_session.query(db.Royal).all()
+        wiki_pages = db_session.query(db.WikiEntry).all()
         db_session.close()
-        return render_template("main.html", royals=royals)
+        return render_template("main.html", royals=royals, wiki_pages=wiki_pages)
     return redirect(url_for("page_login"))