diff --git a/templates/album.html b/templates/album.html
index 245ea18..2ebee75 100644
--- a/templates/album.html
+++ b/templates/album.html
@@ -27,8 +27,9 @@ p
     <h2>{{album.title}}</h2>
     <p>{{album.description}}</p>
     {% set parent=album.parent() %}
+    {% set viewparam = "?view=list" if view == "list" else "" %}
     {% if parent %}
-    <h3>Parent: <a href="/album/{{parent.id}}">{{parent.display_name}}</a></h3>
+    <h3>Parent: <a href="/album/{{parent.id}}{{viewparam}}">{{parent.display_name}}</a></h3>
     {% else %}
     <h3>Parent: <a href="/albums">Albums</a></h3>
     {% endif %}
@@ -37,7 +38,7 @@ p
     <h3>Sub-albums</h3>
     <ul>
         {% for sub_album in sub_albums|sort(attribute='title') %}
-        <li><a href="/album/{{sub_album.id}}">{{sub_album.display_name}}</a>
+        <li><a href="/album/{{sub_album.id}}{{viewparam}}">{{sub_album.display_name}}</a>
         </li>
         {% endfor %}
     </ul>