diff --git a/src/lib/components/assets/shared/info-panel.svelte b/src/lib/components/assets/shared/info-panel.svelte
index 240676d4..191f62e5 100644
--- a/src/lib/components/assets/shared/info-panel.svelte
+++ b/src/lib/components/assets/shared/info-panel.svelte
@@ -153,7 +153,6 @@
   <section>
     <h4>{$_('used_in')}</h4>
     {#each usedEntries as entry (entry.sha)}
-      {@const { slug } = entry}
       {#each getAssociatedCollections(entry) as collection (collection.name)}
         {@const collectionLabel = collection.label || collection.name}
         {#each getFilesByEntry(collection, entry) as collectionFile (collectionFile.name)}
@@ -164,7 +163,7 @@
           })}
         {:else}
           {@render usedEntryLink({
-            link: `/collections/${collection.name}/entries/${slug}`,
+            link: `/collections/${collection.name}/entries/${entry.subPath}`,
             collectionLabel,
             entryLabel: getEntrySummary(collection, entry, { useTemplate: true }),
           })}
diff --git a/src/lib/components/contents/details/toolbar.svelte b/src/lib/components/contents/details/toolbar.svelte
index 8c0f3ab8..d0d7a8a5 100644
--- a/src/lib/components/contents/details/toolbar.svelte
+++ b/src/lib/components/contents/details/toolbar.svelte
@@ -93,7 +93,7 @@
       } else {
         if (isNew) {
           // Update the URL
-          goto(`/collections/${collectionName}/entries/${savedEntry.slug}`, {
+          goto(`/collections/${collectionName}/entries/${savedEntry.subPath}`, {
             replaceState: true,
             notifyChange: false,
           });
diff --git a/src/lib/components/search/entry-result-item.svelte b/src/lib/components/search/entry-result-item.svelte
index 0d819848..6c807b2c 100644
--- a/src/lib/components/search/entry-result-item.svelte
+++ b/src/lib/components/search/entry-result-item.svelte
@@ -13,7 +13,7 @@
    */
   export let entry;
 
-  $: ({ slug, locales } = entry);
+  $: ({ locales, subPath } = entry);
 </script>
 
 {#snippet resultRow(
@@ -27,7 +27,7 @@
   {#if content}
     <GridRow
       onclick={() => {
-        goto(`/collections/${collection?.name}/entries/${collectionFile?.name || slug}`);
+        goto(`/collections/${collection?.name}/entries/${collectionFile?.name || subPath}`);
       }}
     >
       <GridCell class="image">