diff --git a/source/talks.html.twig b/source/talks.html.twig
index 4a14d632..fabc9472 100644
--- a/source/talks.html.twig
+++ b/source/talks.html.twig
@@ -36,11 +36,28 @@ use:
 
 {% set now = 'now'|date('U') %}
 
-<dl>
-  {% for talk in page.talks|reverse if talk.date <= now %}
-    {% if loop.first %}<h2>Previous Talks</h2>{% endif %}
+{% set found = false %}
+{% for talk in page.talks|reverse if talk.date >= now %}
+  {% if loop.first %}
+    <h2>Upcoming Talks</h2>
+    <dl>
+  {% endif %}
 
-    <dt>{{ talk.date|date('F Y') }} - {{ talk.location }}</dt>
-    <dd>{{ talk.description|raw }}</dd>
-  {% endfor %}
-</dl>
\ No newline at end of file
+  {% include 'talk-listing-item' %}
+{% endfor %}
+{% if found %}
+  </dl>
+{% endif %}
+
+{% set found = false %}
+{% for talk in page.talks|reverse if talk.date < now %}
+  {% if loop.first %}
+    <h2>Previous Talks</h2>
+    <dl>
+  {% endif %}
+
+  {% include 'talk-listing-item' %}
+{% endfor %}
+{% if found %}
+  </dl>
+{% endif %}
diff --git a/source/themes/opdavies/opdavies/_partials/talk-listing-item.html.twig b/source/themes/opdavies/opdavies/_partials/talk-listing-item.html.twig
new file mode 100644
index 00000000..341051c4
--- /dev/null
+++ b/source/themes/opdavies/opdavies/_partials/talk-listing-item.html.twig
@@ -0,0 +1,2 @@
+<dt>{{ talk.date|date('F Y') }} - {{ talk.location }}</dt>
+<dd>{{ talk.description|raw }}</dd>
\ No newline at end of file