diff --git a/Enderal - Forgotten Stories.esm b/Enderal - Forgotten Stories.esm
index 122f6a15..b0f032b6 100644
Binary files a/Enderal - Forgotten Stories.esm and b/Enderal - Forgotten Stories.esm differ
diff --git a/scripts/_00E_ContainerController.pex b/scripts/_00E_ContainerController.pex
index 800ea378..27da7a71 100644
Binary files a/scripts/_00E_ContainerController.pex and b/scripts/_00E_ContainerController.pex differ
diff --git a/source/scripts/_00E_ContainerController.psc b/source/scripts/_00E_ContainerController.psc
index 986b6128..9b82071f 100644
--- a/source/scripts/_00E_ContainerController.psc
+++ b/source/scripts/_00E_ContainerController.psc
@@ -54,10 +54,10 @@ event OnMenuOpen(String MenuName)
 			return
 		endif
 		
-		if ! ( lootMenuRef.GetBaseObject() as Container ) || lootMenuRef.IsLocked() || lootMenuRef.IsActivationBlocked()
+		if ! ( lootMenuRef.GetBaseObject() as Container ) || lootMenuRef.IsLocked() || lootMenuRef.IsActivationBlocked() || lootMenuRef.GetActorOwner() == Player
 			return
 		endif
-
+		
 		bLmHasGold = lootMenuRef.GetItemCount(Gold001) >= 5
 		bLmHasSlot = false
 		
@@ -78,10 +78,10 @@ event OnMenuOpen(String MenuName)
 	if MenuName == "ContainerMenu"
 		ObjectReference currentContainer = EnderalFunctions.GetCurrentContainer()
 
-		if ! currentContainer || currentContainer as Actor
+		if ! currentContainer || currentContainer as Actor || currentContainer.GetActorOwner() == Player || currentContainer.GetParentCell() != PlayerREF.GetParentCell()
 			return
 		endif
-	
+		
 		if currentContainer == containerToFill
 			; Opened hidden container
 			Utility.Wait(0.1)
@@ -359,6 +359,7 @@ bool bLmHasGold
 bool bLmHasSlot
 
 Actor Property PlayerRef  Auto  
+ActorBase Property Player  Auto  
 
 GlobalVariable Property PlayerLevel  Auto  
 GlobalVariable Property _00E_HiddenSlotAchievementUnlocked  Auto