diff --git a/src/components/ItemsList.tsx b/src/components/ItemsList.tsx
index 64de2e2..8d98601 100644
--- a/src/components/ItemsList.tsx
+++ b/src/components/ItemsList.tsx
@@ -274,13 +274,14 @@ export function ItemsList({ url }: ItemsListProps) {
           setPropertyLabels(prev => ({ ...prev, ...labels }));
         });
       }
-      
-      // Set initial focus
-      if (loadedItems.length > 0 && !focusedItemId) {
-        setFocusedItemId(loadedItems[0].id);
-      }
     }
-  }, [itemsData, focusedItemId]);
+  }, [itemsData]);
+
+  // Reset focus state when URL changes
+  useEffect(() => {
+    setFocusedCell(null);
+    setFocusedItemId(null);
+  }, [url]);
 
   // Mutations
   const saveItemMutation = useMutation({