diff --git a/_includes/course-excerpt.html b/_includes/course-excerpt.html
index 59525d96..e0597694 100644
--- a/_includes/course-excerpt.html
+++ b/_includes/course-excerpt.html
@@ -23,13 +23,22 @@
     <p><strong>Distribution:</strong> {{ include.distribution }}</p>
   {% endif %}
 
+  {% assign teaching_link = "/teaching" | relative_url %}
   {% if include.next_offered %}
-    <p><strong>Next offering:</strong> {{ include.next_offered }}</p>
+    <p><strong>Next offering:</strong></p>
+    <div class="tags">
+      <a
+        href="{{ teaching_link }}?search=&quot;{{ include.next_offered }}&quot;"
+        class="tag"
+        data-tooltip="Show courses taught in {{ include.next_offered }}"
+      >
+        {{ include.next_offered }}
+      </a>
+    </div>
   {% endif %}
 
   {% assign terms_offered = include.terms_offered | default: empty %}
   {% if terms_offered.size > 0 %}
-    {% assign teaching_link = "/teaching" | relative_url %}
     <p><strong>Previously offered:</strong></p>
     <div class="tags">
       {% for term in terms_offered %}
diff --git a/_includes/list.html b/_includes/list.html
index eba382bc..037de2f7 100644
--- a/_includes/list.html
+++ b/_includes/list.html
@@ -21,42 +21,40 @@
 
   {% for d in data %}
     {% assign style = d.style | default: include.style %}
-
-    {%
-      include {{ include.component | append: ".html" }}
-      author=d.author
-      authors=d.authors
-      buttons=d.buttons
-      caption=d.caption
-      course_website=d.course_website
-      content=d.content
-      date=d.date
-      description=d.description
-      distribution=d.distribution
-      excerpt=d.excerpt
-      height=d.height
-      icon=d.icon
-      id=d.id
-      image=d.image
-      last_modified_at=d.last_modified_at
-      link=d.link
-      lookup=d.lookup
-      name=d.name
-      publisher=d.publisher
-      repo=d.repo
-      role=d.role
-      slug=d.slug
-      style=style
-      subtitle=d.subtitle
-      tags=d.tags
-      terms_offered=d.terms_offered
-      text=d.text
-      next_offered=d.next_offered
-      title=d.title
-      tooltip=d.tooltip
-      type=d.type
-      url=d.url
-      width=d.width
-    %}
+{% include {{ include.component | append: ".html" }}
+  author=d.author
+  authors=d.authors
+  buttons=d.buttons
+  caption=d.caption
+  course_website=d.course_website
+  content=d.content
+  date=d.date
+  description=d.description
+  distribution=d.distribution
+  excerpt=d.excerpt
+  height=d.height
+  icon=d.icon
+  id=d.id
+  image=d.image
+  last_modified_at=d.last_modified_at
+  link=d.link
+  lookup=d.lookup
+  name=d.name
+  publisher=d.publisher
+  repo=d.repo
+  role=d.role
+  slug=d.slug
+  style=style
+  subtitle=d.subtitle
+  tags=d.tags
+  terms_offered=d.terms_offered
+  text=d.text
+  next_offered=d.next_offered
+  title=d.title
+  tooltip=d.tooltip
+  type=d.type
+  url=d.url
+  width=d.width
+%}
   {% endfor %}
 {% endfor %}