diff --git a/ephios/core/templates/core/event_list.html b/ephios/core/templates/core/event_list.html
index 45f32955e..aeacad917 100644
--- a/ephios/core/templates/core/event_list.html
+++ b/ephios/core/templates/core/event_list.html
@@ -80,24 +80,8 @@ <h1>{% translate "Events" %}
         </form>
         {% if mode == "calendar" or mode == "day" %}
             {% if perms.core.add_event %}
-                <div class="dropdown">
-                    <button class="btn btn-primary btn-sm dropdown-toggle d-none d-md-inline-block" type="button"
-                            id="eventCreateButton"
-                            data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                        <span class="fa fa-plus"></span>
-                        {% translate "Add event" %}
-                    </button>
-                    <div class="dropdown-menu dropdown-menu-right" aria-labelledby="eventCreateButton">
-                        {% for eventtype in eventtypes %}
-                            <a class="dropdown-item" href="{% url "core:event_create" eventtype.pk %}">
-                                {% blocktranslate trimmed with title=eventtype.title %}
-                                    Add {{ title }}
-                                {% endblocktranslate %}</a>
-                        {% endfor %}
-                    </div>
-                </div>
+                {% include "core/fragments/event_list_add_event_button.html" %}
             {% endif %}
-
             <div class="d-flex justify-content-between mt-2">
                 <a class="btn btn-secondary"
                    href="?{% param_replace date=previous_date|date:"Y-m-d" %}"
@@ -128,21 +112,19 @@ <h3 class="mx-3">
                     <i class="fas fa-arrow-right"></i></a>
             </div>
         {% endif %}
-
-
     </div>
 
-    {% if mode == "calendar" %}
-        {{ calendar }}
+    {% if mode == "list" %}
+        {% include "core/fragments/event_list_list_mode.html" %}
     {% elif not event_list %}
         <div class="mb-3">
             <h5 class="mt-5 text-center">
-                {% translate "No results." %}
+                {% translate "No results" %}
             </h5>
         </div>
+    {% elif mode == "calendar" %}
+        {{ calendar }}
     {% elif mode == "day" %}
         {% include "core/fragments/event_list_day_mode.html" %}
-    {% else %}
-        {% include "core/fragments/event_list_list_mode.html" %}
     {% endif %}
 {% endblock %}
diff --git a/ephios/core/templates/core/fragments/event_list_add_event_button.html b/ephios/core/templates/core/fragments/event_list_add_event_button.html
new file mode 100644
index 000000000..ee3248b35
--- /dev/null
+++ b/ephios/core/templates/core/fragments/event_list_add_event_button.html
@@ -0,0 +1,17 @@
+{% load i18n %}
+<div class="dropdown m-1 ms-0">
+    <button class="btn btn-primary btn-sm dropdown-toggle d-none d-md-inline-block" type="button"
+            id="eventCreateButton"
+            data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <span class="fa fa-plus"></span>
+        {% translate "Add event" %}
+    </button>
+    <div class="dropdown-menu dropdown-menu-right" aria-labelledby="eventCreateButton">
+        {% for eventtype in eventtypes %}
+            <a class="dropdown-item" href="{% url "core:event_create" eventtype.pk %}">
+                {% blocktranslate trimmed with title=eventtype.title %}
+                    Add {{ title }}
+                {% endblocktranslate %}</a>
+        {% endfor %}
+    </div>
+</div>
\ No newline at end of file
diff --git a/ephios/core/templates/core/fragments/event_list_list_mode.html b/ephios/core/templates/core/fragments/event_list_list_mode.html
index 2985443e6..c8173c019 100644
--- a/ephios/core/templates/core/fragments/event_list_list_mode.html
+++ b/ephios/core/templates/core/fragments/event_list_list_mode.html
@@ -6,21 +6,7 @@
     {% csrf_token %}
     {% if perms.core.add_event %}
         <div id="event-controls" class="d-flex flex-wrap pb-3">
-            <div class="dropdown m-1 ms-0">
-                <button class="btn btn-primary btn-sm dropdown-toggle" type="button" id="eventCreateButton"
-                        data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    <span class="fa fa-plus"></span>
-                    {% translate "Add event" %}
-                </button>
-                <div class="dropdown-menu dropdown-menu-right" aria-labelledby="eventCreateButton">
-                    {% for eventtype in eventtypes %}
-                        <a class="dropdown-item" href="{% url "core:event_create" eventtype.pk %}">
-                            {% blocktranslate trimmed with title=eventtype.title %}
-                                Add {{ title }}
-                            {% endblocktranslate %}</a>
-                    {% endfor %}
-                </div>
-            </div>
+            {% include "core/fragments/event_list_add_event_button.html" %}
             <div class="bulk-actions">
                 <button class="btn btn-secondary btn-sm m-1 ms-0" type="submit" name="delete"
                         formaction="{% url "core:event_bulk_delete" %}"><span
@@ -31,7 +17,7 @@
     {% endif %}
 
     <ul class="list-group mb-3">
-        {% if perms.core.add_event %}
+        {% if event_list and perms.core.add_event %}
             <li class="list-group-item px-0">
                 <div class="ps-2">
                     <input type="checkbox" id="checkall">
@@ -47,14 +33,6 @@
                                  data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-html="true"
                                  title="{% for state in counter %}<div>
 
-
-
-
-
-
-
-
-
                                             {% if event.shifts.all|length > 1 %}{{ counter|get:state }} {% endif %}{{ ParticipationStates.labels_dict|get:state }}</div>{% endfor %}"
                              {% endif %}>
                             {% if counter|get:ParticipationStates.CONFIRMED > 0 %}
@@ -126,6 +104,12 @@ <h5 class="mb-0 text-break">
                     </a>
                 </li>
             {% endwith %}
+        {% empty %}
+            <div class="mb-3">
+                <h5 class="mt-5 text-center">
+                    {% translate "No results" %}
+                </h5>
+            </div>
         {% endfor %}
     </ul>
     {% include 'core/pagination.html' %}
diff --git a/ephios/locale/de/LC_MESSAGES/django.po b/ephios/locale/de/LC_MESSAGES/django.po
index 6b4b05f45..7bbdf73ce 100644
--- a/ephios/locale/de/LC_MESSAGES/django.po
+++ b/ephios/locale/de/LC_MESSAGES/django.po
@@ -1908,8 +1908,8 @@ msgstr "%(title)s hinzufügen"
 
 #: ephios/core/templates/core/event_list.html:140
 #: ephios/plugins/federation/templates/federation/external_event_list.html:67
-msgid "No results."
-msgstr "Keine Ergebnisse."
+msgid "No results"
+msgstr "Keine Ergebnisse"
 
 #: ephios/core/templates/core/event_notification.html:7
 #: ephios/core/templates/core/event_notification.html:16
diff --git a/ephios/plugins/federation/templates/federation/external_event_list.html b/ephios/plugins/federation/templates/federation/external_event_list.html
index 05a9916fb..98b27fad7 100644
--- a/ephios/plugins/federation/templates/federation/external_event_list.html
+++ b/ephios/plugins/federation/templates/federation/external_event_list.html
@@ -64,7 +64,7 @@ <h5 class="mb-0 text-break d-inline-block">
         {% empty %}
             <div class="mb-3">
                 <h5 class="mt-5 text-center">
-                    {% translate "No results." %}
+                    {% translate "No results" %}
                 </h5>
             </div>
         {% endfor %}