diff --git a/src/pretix/presale/templates/pretixpresale/organizers/index.html b/src/pretix/presale/templates/pretixpresale/organizers/index.html
index 33f9381ff..4a7bb8224 100644
--- a/src/pretix/presale/templates/pretixpresale/organizers/index.html
+++ b/src/pretix/presale/templates/pretixpresale/organizers/index.html
@@ -30,24 +30,24 @@
             </div>
         </div>
     </div>
-    {% if events %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h2 class="panel-title">
-                    <b>
-                    {% if "old" in request.GET %}
-                        {% trans "Past events" %}
-                    {% else %}
-                        {% trans "Upcoming events" %}
-                    {% endif %}
-                    </b>
-                </h2>
-            </div>
-        {% if filter_form.fields %}
-            <div class="panel-subhead">
-                {% include "pretixpresale/fragment_event_list_filter.html" with request=request %}
-            </div>
-        {% endif %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h2 class="panel-title">
+                <b>
+                {% if "old" in request.GET %}
+                    {% trans "Past events" %}
+                {% else %}
+                    {% trans "Upcoming events" %}
+                {% endif %}
+                </b>
+            </h2>
+        </div>
+    {% if filter_form.fields %}
+        <div class="panel-subhead">
+            {% include "pretixpresale/fragment_event_list_filter.html" with request=request %}
+        </div>
+    {% endif %}
+        {% if events %}
             <div class="panel-body">
                 <dl class="full-width-list alternating-rows">
                 {% for e in events %}{% eventurl e "presale:event.index" as url %}
@@ -99,12 +99,15 @@
                 {% endfor %}
                 </dl>
             </div>
+            <hr>
+        {% endif %}
+        <div class="panel-body">
+            {% if "old" in request.GET %}
+                <p><em>{% if not events %}{% trans "No archived events found." %} {% endif %}<a href="?{% url_replace request "old" "" %}">{% trans "Show upcoming" %}</a></em></p>
+            {% else %}
+                <p><em>{% if not events %}{% trans "No public upcoming events found." %} {% endif %}<a href="?{% url_replace request "old" "1" %}">{% trans "Show past events" %}</a></em></p>
+            {% endif %}
         </div>
-    {% endif %}
-    {% if "old" in request.GET %}
-        <p><em>{% if not events %}{% trans "No archived events found." %} {% endif %}<a href="?{% url_replace request "old" "" %}">{% trans "Show upcoming" %}</a></em></p>
-    {% else %}
-        <p><em>{% if not events %}{% trans "No public upcoming events found." %} {% endif %}<a href="?{% url_replace request "old" "1" %}">{% trans "Show past events" %}</a></em></p>
-    {% endif %}
+    </div>
     {% include "pretixpresale/pagination.html" %}
 {% endblock %}
diff --git a/src/pretix/static/pretixpresale/scss/_event.scss b/src/pretix/static/pretixpresale/scss/_event.scss
index 71d2cb779..3b901caed 100644
--- a/src/pretix/static/pretixpresale/scss/_event.scss
+++ b/src/pretix/static/pretixpresale/scss/_event.scss
@@ -145,6 +145,11 @@ article.item-with-variations .product-row:last-child:after {
     margin-bottom: 0;
 }
 
+.panel > hr {
+    margin: 0;
+    border-top: 1px solid $table-border-color;
+}
+
 .product-row {
     padding: 1.25*$line-height-computed 0;
 
diff --git a/src/pretix/static/pretixpresale/scss/main.scss b/src/pretix/static/pretixpresale/scss/main.scss
index 7c49aa708..7d33e96c5 100644
--- a/src/pretix/static/pretixpresale/scss/main.scss
+++ b/src/pretix/static/pretixpresale/scss/main.scss
@@ -413,7 +413,6 @@ details.details-open .panel-title::before {
 }
 
 .panel-subhead {
-    margin-bottom: 15px;
     padding: 15px;
     background: $table-bg-accent;
     border-bottom: 1px solid $table-border-color;