diff --git a/templates/mailman-django/base.html b/templates/mailman-django/base.html
index 133690d..684401c 100644
--- a/templates/mailman-django/base.html
+++ b/templates/mailman-django/base.html
@@ -44,7 +44,8 @@
         {% block smallBoxRight %}{% endblock %}
         <div id="mm_footer">
             {% block footer %}
-            <p id=logout><a href="{% url logout %}">{% trans "Logout" %}</a></p>
+            {% include "mailman-django/list_selector.html" %}
+            <p id="logout"><a href="{% url logout %}">{% trans "Logout" %}</a></p>
             {% endblock %}
         </div>
     </div>
diff --git a/templates/mailman-django/list_selector.html b/templates/mailman-django/list_selector.html
index 93f7f8a..ad9ae29 100644
--- a/templates/mailman-django/list_selector.html
+++ b/templates/mailman-django/list_selector.html
@@ -1,16 +1,19 @@
 {% load i18n %}
 
 {% block selector %}
-
-{%if lists %}
-<form id=list_selector method="post" action="/lists/">
-    <select name="list">
-        {% for list in lists %}
-            <option selected="" value="{{list.fqdn_listname}}">{{list.real_name}}</option>
-        {% endfor %}
-    </select>
-<input type="submit" value="Go to">
-</div></form>
-</form>
+<div id="list_selector">
+{%if lists|length >= 1 and lists|length <= 15 %}
+    <form id=list_selector method="post" action="/lists/">
+        <select name="list">
+            {% for list in lists %}
+                <option selected="" value="{{list.fqdn_listname}}">{{list.real_name}}</option>
+            {% endfor %}
+        </select>
+    <input type="submit" value="Go to">
+    </div></form>
+    </form>
+{% else %}
+    <a href="{% url list_index %}">{% trans "List Index" %}</a>
 {%endif%}
+</div>
 {% endblock %}