diff --git a/Scripts/ETR_TrackFoundItems.pex b/Scripts/ETR_TrackFoundItems.pex
index 0e1b1e4..62ec248 100644
Binary files a/Scripts/ETR_TrackFoundItems.pex and b/Scripts/ETR_TrackFoundItems.pex differ
diff --git a/Source/Scripts/ETR_TrackFoundItems.psc b/Source/Scripts/ETR_TrackFoundItems.psc
index 42ad628..1969160 100644
--- a/Source/Scripts/ETR_TrackFoundItems.psc
+++ b/Source/Scripts/ETR_TrackFoundItems.psc
@@ -32,6 +32,7 @@ Event OnPlayerLoadGame()
 	Location currentLocation = PlayerRef.GetCurrentLocation()
 	bAtHome = currentLocation && currentLocation.HasKeyword(LocTypePlayerHouse)
 	lastDestContainer = None
+	bBusy = false
 EndEvent
 
 
@@ -73,6 +74,12 @@ Event OnUpdate()
 		Debug.Notification("Team changed, rescanning")
 	endif
 
+	if lastDestContainer && lastDestContainer as Actor && (lastDestContainer as Actor).IsPlayerTeammate()
+		lastDestContainer = None
+		bRescanHome = false
+		return
+	endif
+
 	if UI.IsMenuOpen("ContainerMenu")
 		RegisterForMenu("ContainerMenu")
 		return
@@ -91,11 +98,6 @@ Event OnUpdate()
 	if bRescanHome
 		bRescanHome = false
 
-		if lastDestContainer && lastDestContainer as Actor && (lastDestContainer as Actor).IsPlayerTeammate()
-			lastDestContainer = None
-			return
-		endif
-
 		if lastDestContainer && lastDestContainer as PlayerBookShelfContainerScript
 			int iLimit = 10
 			while iLimit >= 0 && (lastDestContainer as PlayerBookShelfContainerScript).GetState() == "PlacingBooks"