diff --git a/generic/forms.py b/generic/forms.py
index 08e69c89..3804798d 100755
--- a/generic/forms.py
+++ b/generic/forms.py
@@ -74,6 +74,7 @@ from crispy_forms.layout import Submit, Layout, Fieldset, Field, Div
 from crispy_forms.bootstrap import Accordion, AccordionGroup
 
 from dal import autocomplete
+from autocomplete import widgets as htmx_widgets, Autocomplete, AutocompleteWidget, ModelAutocomplete, register as autocomplete_register
 
 
 class SplitDateTimeFieldDefaultTime(SplitDateTimeField):
@@ -746,6 +747,7 @@ class SupervisorForm(ModelForm):
 class ExamCollectionForm(ModelForm):
     GROUP_TYPES = (
         ("Rapid Exams", "rapids_exams", RapidsExam),
+        ("Shorts Exams", "shorts_exams", ShortsExam),
         ("Long Exams", "longs_exams", LongsExam),
         ("SBA Exams", "sbas_exams", SbasExam),
         ("Physic Exams", "physics_exams", PhysicsExam),
@@ -818,7 +820,6 @@ class ExamCollectionCloneForm(ModelForm):
         model = ExamCollection
         fields = ("name", "date")
 
-from autocomplete import widgets as htmx_widgets, Autocomplete, AutocompleteWidget, ModelAutocomplete, register as autocomplete_register
 
 class UserAutocomplete(ModelAutocomplete):
     model = User
diff --git a/generic/templates/generic/examcollection_detail.html b/generic/templates/generic/examcollection_detail.html
index 746a5632..adc13509 100755
--- a/generic/templates/generic/examcollection_detail.html
+++ b/generic/templates/generic/examcollection_detail.html
@@ -58,6 +58,17 @@
             </div>
         {% endif %}
 
+        {% if object.shorts_exams.all %}
+            <h2>Shorts Exams:</h2>
+            {% with exams=object.shorts_exams.all app_name="shorts" %}
+                {% include "exam_list.html#exam-list" %}
+            {% endwith %}
+            <a href="{% url 'shorts:exam_list_collection' object.pk %}">View exam list</a>
+            <div class="add-marker">
+            <button class="btn-sm add-marker-button" hx-get="{% url 'generic:exam_collection_add_marker' object.pk 'shorts' %}" hx-target=".add-marker" hx-swap="innerHTML">Add marker</button>
+            </div>
+        {% endif %}
+
         {% if object.physics_exams.all %}
             <h2>Physics Exams:</h2>
             {% with exams=object.physics_exams.all app_name="physics" %}