diff --git a/photologue/templates/photologue/gallery_archive.html b/photologue/templates/photologue/gallery_archive.html
index 4cd683d..206dd58 100644
--- a/photologue/templates/photologue/gallery_archive.html
+++ b/photologue/templates/photologue/gallery_archive.html
@@ -32,4 +32,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
         {% endif %}
     </main>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/photologue/templates/photologue/gallery_archive_year.html b/photologue/templates/photologue/gallery_archive_year.html
index 8be8f21..54cdb95 100644
--- a/photologue/templates/photologue/gallery_archive_year.html
+++ b/photologue/templates/photologue/gallery_archive_year.html
@@ -9,22 +9,27 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% block title %}{% blocktrans with show_year=year|date:"Y" %}Galleries for {{ show_year }}{% endblocktrans %}{% endblock %}
 
 {% block content %}
-	<div class="row">
-		<aside class="col-md-2">
-		    <a href="{% url 'photologue:pl-gallery-archive' %}">⬅ {% trans "View all galleries" %}</a>
-		</aside>
-		<main class="col-md-10">
-			{% if object_list %}
-                <div class="row mb-2">
-				{% for gallery in object_list %}
-                    <div class="col-6 col-md-3 mb-2">
-                        {% include "photologue/includes/gallery_sample.html" %}
-                    </div>
-                {% endfor %}
+<div class="row">
+    <aside class="col-md-2">
+        <h5>{% trans "Filter by year" %}</h5>
+        <div class="list-group">
+            {% for date in date_list %}
+            <a class="list-group-item list-group-item-action{% if date == year %} active{% endif %}" href="{% url 'photologue:pl-gallery-archive-year' date.year %}">{{ date|date:"Y" }}</a>
+            {% endfor %}
+        </div>
+    </aside>
+    <main class="col-md-10">
+        {% if object_list %}
+            <div class="row mb-2">
+            {% for gallery in object_list %}
+                <div class="col-6 col-md-3 mb-2">
+                    {% include "photologue/includes/gallery_sample.html" %}
                 </div>
-			{% else %}
-			    <p>{% trans "No galleries were found." %}</p>
-			{% endif %}
-		</main>
-	</div>
-{% endblock %}
\ No newline at end of file
+            {% endfor %}
+            </div>
+        {% else %}
+            <p>{% trans "No galleries were found." %}</p>
+        {% endif %}
+    </main>
+</div>
+{% endblock %}
diff --git a/photologue/views.py b/photologue/views.py
index 93b9c9b..af1249d 100644
--- a/photologue/views.py
+++ b/photologue/views.py
@@ -37,6 +37,12 @@ class GalleryDateView(LoginRequiredMixin):
         else:
             return qs.filter(photos__is_public=True).distinct()
 
+    def get_context_data(self, **kwargs):
+        """Always show all years in archive"""
+        context = super().get_context_data(**kwargs)
+        context['date_list'] = self.get_queryset().dates(self.date_field, 'year', 'DESC')
+        return context
+
 
 class GalleryArchiveIndexView(GalleryDateView, ArchiveIndexView):
     pass