diff --git a/frontend/src/components/activity/ScheduleEntry.vue b/frontend/src/components/activity/ScheduleEntry.vue
index d67404c733..a77ba2ef66 100644
--- a/frontend/src/components/activity/ScheduleEntry.vue
+++ b/frontend/src/components/activity/ScheduleEntry.vue
@@ -168,7 +168,11 @@ Displays a single scheduleEntry
             <table>
               <thead>
                 <tr>
-                  <th scope="col" class="text-right pb-2 pr-4">
+                  <th
+                    v-if="category.numberingStyle !== '-'"
+                    scope="col"
+                    class="text-right pb-2 pr-4"
+                  >
                     {{ $tc('entity.scheduleEntry.fields.nr') }}
                   </th>
                   <th scope="col" class="text-left pb-2 pr-4">
@@ -184,8 +188,20 @@ Displays a single scheduleEntry
                   v-for="scheduleEntryItem in scheduleEntries"
                   :key="scheduleEntryItem._meta.self"
                 >
-                  <th class="text-right tabular-nums pb-2 pr-4">
-                    {{ scheduleEntryItem.number }}
+                  <th
+                    v-if="category.numberingStyle !== '-'"
+                    class="text-right tabular-nums pb-2 pr-4"
+                  >
+                    <RouterLink
+                      v-if="scheduleEntryItem._meta.self !== scheduleEntry()._meta.self"
+                      :to="scheduleEntryRoute(scheduleEntryItem)"
+                      class="e-title-link"
+                    >
+                      {{ scheduleEntryItem.number }}
+                    </RouterLink>
+                    <template v-else>
+                      {{ scheduleEntryItem.number }}
+                    </template>
                   </th>
                   <td class="text-left tabular-nums pb-2 pr-4">
                     {{
@@ -196,7 +212,19 @@ Displays a single scheduleEntry
                     {{ dateShort(scheduleEntryItem.start) }}
                   </td>
                   <td class="text-left tabular-nums pb-2 pr-0">
-                    {{ rangeLongEnd(scheduleEntryItem.start, scheduleEntryItem.end) }}
+                    <RouterLink
+                      v-if="
+                        category.numberingStyle === '-' &&
+                        scheduleEntryItem._meta.self !== scheduleEntry()._meta.self
+                      "
+                      :to="scheduleEntryRoute(scheduleEntryItem)"
+                      class="e-title-link"
+                    >
+                      {{ rangeLongEnd(scheduleEntryItem.start, scheduleEntryItem.end) }}
+                    </RouterLink>
+                    <template v-else>
+                      {{ rangeLongEnd(scheduleEntryItem.start, scheduleEntryItem.end) }}
+                    </template>
                   </td>
                 </tr>
               </tbody>
@@ -404,6 +432,7 @@ export default {
           this.$toast.error(errorToMultiLineToast(e))
         })
     },
+    scheduleEntryRoute,
     countContentNodes(contentType) {
       return this.contentNodes.items.filter((cn) => {
         return cn.contentType().id === contentType.id
diff --git a/frontend/src/components/activity/dialog/DialogActivityEdit.vue b/frontend/src/components/activity/dialog/DialogActivityEdit.vue
index cf68548e1f..9bd4f9a603 100644
--- a/frontend/src/components/activity/dialog/DialogActivityEdit.vue
+++ b/frontend/src/components/activity/dialog/DialogActivityEdit.vue
@@ -19,6 +19,7 @@
     </template>
     <DialogActivityForm
       :activity="entityData"
+      :current-schedule-entry="scheduleEntry"
       :period="scheduleEntry.period"
       :hide-location="hideHeaderFields"
     />
diff --git a/frontend/src/components/activity/dialog/DialogActivityForm.vue b/frontend/src/components/activity/dialog/DialogActivityForm.vue
index 3e63e9cd1c..13b0f0ecc5 100644
--- a/frontend/src/components/activity/dialog/DialogActivityForm.vue
+++ b/frontend/src/components/activity/dialog/DialogActivityForm.vue
@@ -41,6 +41,7 @@
     <FormScheduleEntryList
       v-if="activity.scheduleEntries"
       :schedule-entries="activity.scheduleEntries"
+      :current-schedule-entry="currentScheduleEntry"
       :period="period"
       :periods="camp.periods().items"
     />
@@ -69,6 +70,10 @@ export default {
       type: Object,
       required: true,
     },
+    currentScheduleEntry: {
+      type: Object,
+      required: true,
+    },
     autoselectTitle: {
       type: Boolean,
       default: false,
diff --git a/frontend/src/components/activity/dialog/FormScheduleEntryItem.vue b/frontend/src/components/activity/dialog/FormScheduleEntryItem.vue
index 2726ce06a6..fe35687130 100644
--- a/frontend/src/components/activity/dialog/FormScheduleEntryItem.vue
+++ b/frontend/src/components/activity/dialog/FormScheduleEntryItem.vue
@@ -50,7 +50,7 @@
       </v-col>
 
       <v-col cols="1" class="pt-3 text-center">
-        <button-delete v-if="!isLastItem" icon-only @click="$emit('delete')" />
+        <button-delete v-if="deletable" icon-only @click="$emit('delete')" />
       </v-col>
     </v-row>
   </v-container>
@@ -82,9 +82,9 @@ export default {
     },
 
     // true if current item is the last scheduleEntry
-    isLastItem: {
+    deletable: {
       type: Boolean,
-      required: true,
+      required: false,
     },
   },
   data() {
diff --git a/frontend/src/components/activity/dialog/FormScheduleEntryList.vue b/frontend/src/components/activity/dialog/FormScheduleEntryList.vue
index 0b5eaa5a1b..d296d23600 100644
--- a/frontend/src/components/activity/dialog/FormScheduleEntryList.vue
+++ b/frontend/src/components/activity/dialog/FormScheduleEntryList.vue
@@ -22,7 +22,11 @@
           class="transition-list-item pa-0 mb-4"
           :schedule-entry="scheduleEntry"
           :periods="periods"
-          :is-last-item="scheduleEntriesWithoutDeleted.length === 1"
+          :deletable="
+            scheduleEntriesWithoutDeleted.length > 1 &&
+            ($route.name !== 'activity' ||
+              scheduleEntry.self !== currentScheduleEntry._meta.self)
+          "
           @delete="deleteEntry(scheduleEntry)"
         />
       </transition-group>
@@ -47,6 +51,11 @@ export default {
       required: true,
     },
 
+    currentScheduleEntry: {
+      type: Object,
+      required: true,
+    },
+
     // all available periods
     periods: {
       type: Array,