diff --git a/aleksis/apps/chronos/templates/chronos/partials/subs/subject.html b/aleksis/apps/chronos/templates/chronos/partials/subs/subject.html
index e6c9e86d016237276a2d5c894addba10c8a5942f..1f6391832a3c25a8ae85246511a1dff8b5a37a95 100644
--- a/aleksis/apps/chronos/templates/chronos/partials/subs/subject.html
+++ b/aleksis/apps/chronos/templates/chronos/partials/subs/subject.html
@@ -15,13 +15,9 @@
     <strong>{{ el.subject.abbrev }}</strong>
   </span>
   {% elif el.subject and not el.lesson_period.lesson.subject %}
-    <span data-position="bottom" class="tooltipped" data-tooltip="{{ el.subject.name }}">
-    <strong>{{ el.subject.abbrev }}</strong>
-  </span>
+    {% include "chronos/partials/subject.html" with subject=el.subject %}
   {% else %}
-    <span data-position="bottom" class="tooltipped" data-tooltip="{{ el.lesson_period.lesson.subject.name }}">
-    <strong>{{ el.lesson_period.lesson.subject.abbrev }}</strong>
-  </span>
+    {% include "chronos/partials/subject.html" with subject=el.lesson_period.lesson.subject %}
   {% endif %}
 {% elif type == "supervision_substitution" %}
   {% trans "Supervision" %}