diff --git a/frontend/src/routes/stock/Index.svelte b/frontend/src/routes/stock/Index.svelte
index 7e59ef82..7ab1c641 100644
--- a/frontend/src/routes/stock/Index.svelte
+++ b/frontend/src/routes/stock/Index.svelte
@@ -1,5 +1,6 @@
 <script>
     import { onMount }      from 'svelte';
+    import { useTinyRouter } from 'svelte-tiny-router';
     import { api, drop, get, patch } from '../../urls.svelte';
     import { error, yikes } from '../../warn.svelte';
     import { t }            from '../../translations.svelte';
@@ -19,6 +20,7 @@
     let draggedLocation = $state(null)
     let { item_id, location_id, owner, owner_id, owner_number } = $props();
     let skip_location = false; // disable effect on setting location within loadItem()
+    let router = useTinyRouter();
 
     $effect(() => {
         // This effect runs whenever `location` changes
@@ -98,8 +100,8 @@
     }
 
     async function loadItem(){
-        if (!item_id && !owner_number) return;
-        const url = item_id ? api(`stock/item/${item_id}`) : api(`stock/${owner}/${owner_id}/item/${owner_number}`);
+        if (!owner_number) return;
+        const url = api(`stock/${owner}/${owner_id}/item/${owner_number}`);
         const res = await get(url);
         if (res.ok){
             yikes();
@@ -170,12 +172,27 @@
     }
 
     async function load(){
+        await preload();
         await loadUserLocations();
         await loadPath();
         await loadProperties();
         await loadItem();
     }
 
+    async function preload(){
+        if (item_id) {
+            let url = api(`stock/item/${item_id}`);
+            const res = await get(url);
+            if (res.ok){
+                const json   = await res.json();
+                owner        = json.owner.type;
+                owner_id     = json.owner.id;
+                owner_number = json.owner_number;
+                location_id  = json.location.id;
+            }
+        }
+    }
+
     function moveToTop(loc){
         if (patchLocation(location,'parent_location_id',0)){
             loc.parent_location_id = 0;