diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_calendar.html b/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_calendar.html
index 0adf14929..7402b12a5 100644
--- a/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_calendar.html
+++ b/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_calendar.html
@@ -20,28 +20,23 @@
                         <input type="hidden" name="{{ f }}" value="{{ v }}">
                     {% endif %}
                 {% endfor %}
-                <fieldset>
-                    <legend class="sr-only">{% trans "Select a month to display" %}</legend>
-                    <div>
-                        <label for="calendar-input-date">{% trans "Month" %}</label>
-                    </div>
-                    <div class="input-group">
-                        <select name="date" class="form-control" id="calendar-input-date">
-                        {% for y in subevent_list.years %}
-                            <optgroup label="{{ y }}">
-                            {% for m in subevent_list.months %}
-                                <option value="{{ y }}-{{ m|date:"m" }}" {% if m.month == subevent_list.date.month and y == subevent_list.date.year %}selected{% endif %}>{{ m|date:"F" }} {{ y }}</option>
-                            {% endfor %}
-                            </optgroup>
+                <div>
+                    <label for="calendar-input-date">{% trans "Month" %}</label>
+                </div>
+                <div class="input-group">
+                    <select name="date" class="form-control" id="calendar-input-date">
+                    {% for y in subevent_list.years %}
+                        {% for m in subevent_list.months %}
+                            <option value="{{ y }}-{{ m|date:"m" }}" {% if m.month == subevent_list.date.month and y == subevent_list.date.year %}selected{% endif %}>{{ m|date:"F" }} {{ y }}</option>
                         {% endfor %}
-                        </select>
-                        <span class="input-group-btn">
-                            <button type="submit" class="btn btn-default" aria-label="{% trans "Show month" %}">
-                                {% icon "chevron-right" %}
-                            </button>
-                        </span>
-                    </div>
-                </fieldset>
+                    {% endfor %}
+                    </select>
+                    <span class="input-group-btn">
+                        <button type="submit" class="btn btn-default" aria-label="{% trans "Show month" %}">
+                            {% icon "chevron-right" %}
+                        </button>
+                    </span>
+                </div>
             </form>
         </li>
         <li class="text-right flip">
diff --git a/src/pretix/presale/templates/pretixpresale/organizers/calendar.html b/src/pretix/presale/templates/pretixpresale/organizers/calendar.html
index 16e1044dd..a955ef3dd 100644
--- a/src/pretix/presale/templates/pretixpresale/organizers/calendar.html
+++ b/src/pretix/presale/templates/pretixpresale/organizers/calendar.html
@@ -52,28 +52,23 @@
                                     <input type="hidden" name="{{ f }}" value="{{ v }}">
                                 {% endif %}
                             {% endfor %}
-                            <fieldset>
-                                <legend class="sr-only">{% trans "Select a month to display" %}</legend>
-                                <div>
-                                    <label for="calendar-input-date">{% trans "Month" %}</label>
-                                </div>
-                                <div class="input-group">
-                                    <select name="date" class="form-control" id="calendar-input-date">
-                                    {% for y in years %}
-                                        <optgroup label="{{ y }}">
-                                        {% for m in months %}
-                                            <option value="{{ y }}-{{ m|date:"m" }}" {% if m.month == date.month and y == date.year %}selected{% endif %}>{{ m|date:"F" }} {{ y }}</option>
-                                        {% endfor %}
-                                        </optgroup>
+                            <div>
+                                <label for="calendar-input-date">{% trans "Month" %}</label>
+                            </div>
+                            <div class="input-group">
+                                <select name="date" class="form-control" id="calendar-input-date">
+                                {% for y in years %}
+                                    {% for m in months %}
+                                        <option value="{{ y }}-{{ m|date:"m" }}" {% if m.month == date.month and y == date.year %}selected{% endif %}>{{ m|date:"F" }} {{ y }}</option>
                                     {% endfor %}
-                                    </select>
-                                    <span class="input-group-btn">
-                                        <button type="submit" class="btn btn-default" aria-label="{% trans "Show month" %}">
-                                            {% icon "chevron-right" %}
-                                        </button>
-                                    </span>
-                                </div>
-                            </fieldset>
+                                {% endfor %}
+                                </select>
+                                <span class="input-group-btn">
+                                    <button type="submit" class="btn btn-default" aria-label="{% trans "Show month" %}">
+                                        {% icon "chevron-right" %}
+                                    </button>
+                                </span>
+                            </div>
                         </form>
                     </li>
                     <li class="text-right flip">