diff --git a/src/components/TheEntryList.vue b/src/components/TheEntryList.vue
index ee0fe3e..5827f43 100644
--- a/src/components/TheEntryList.vue
+++ b/src/components/TheEntryList.vue
@@ -67,22 +67,23 @@
 <script setup>
 import { useSchlag } from '../composables/useSchlag.js';
 import { useDataEntries } from '../composables/useDataEntries.js';
-import { nextTick, watch } from 'vue';
+import { watch } from 'vue';
 
 const { allData, emptyEntry, entry } = useDataEntries();
 const { showSchlagParts } = useSchlag();
 
 let removeSchlagParts;
 watch(entry, (value) => {
-  if (value && removeSchlagParts) {
+  if (removeSchlagParts) {
     removeSchlagParts();
   }
+  if (!value.schlaginfo?.basic?.parts) {
+    return;
+  }
+  removeSchlagParts = showSchlagParts(value.schlaginfo.basic.parts);
 });
 function zoomTo(nr) {
   entry.value = JSON.parse(JSON.stringify(allData.value.saved[nr]));
-  nextTick(() => {
-    removeSchlagParts = showSchlagParts(allData.value.saved[nr].schlaginfo.basic.parts);
-  });
 }
 
 function editEntry(nr) {