diff --git a/picopaper.py b/picopaper.py
index b7d5407..b3d69ff 100644
--- a/picopaper.py
+++ b/picopaper.py
@@ -211,9 +211,9 @@ class SSGGGenerator:
         for feed_name, posts in feeds.items():
             self.generate_index(posts, feed_name)
 
-        # Generate individual pages for long posts and pages
+        # Generate individual pages for long posts, short posts, and pages
         for post in all_posts:
-            if post['type'] in ['long', 'page']:
+            if post['type'] in ['long', 'short', 'page']:
                 self.generate_post_page(post)
 
         # Copy assets
diff --git a/theme/default/templates/index.tmpl b/theme/default/templates/index.tmpl
index 2519d4b..f1c1e01 100644
--- a/theme/default/templates/index.tmpl
+++ b/theme/default/templates/index.tmpl
@@ -11,7 +11,7 @@
         <article class="post">
             <div class="post-meta">{{ post.date }}</div>
             <h2 class="post-title">
-                {% if post.type == 'long' %}
+                {% if post.type in ['long', 'short'] %}
                 <a href="{{ post.url }}">{{ post.title }}</a>
                 {% else %}
                 {{ post.title }}