diff --git a/Changelog.txt b/Changelog.txt
index 2f830e38d..63b9a5bd4 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -3435,3 +3435,6 @@ Additionally, the problem of zig-zag issue following in the South direction has
 
 18-11-2023, Nolok
 - Fixed: House customization sending wrong component data, breaking it.
+
+19-11-2023, Raylde
+- Modified: Snooping use Range for the distance
diff --git a/src/game/chars/CCharNotoriety.cpp b/src/game/chars/CCharNotoriety.cpp
index 7ae807d01..3075c104b 100644
--- a/src/game/chars/CCharNotoriety.cpp
+++ b/src/game/chars/CCharNotoriety.cpp
@@ -557,15 +557,15 @@ void CChar::Noto_Kill(CChar * pKill, int iTotalKillers)
 	if ( !pKill )
 		return;
 
-	// What was their noto to me ?
-	NOTO_TYPE NotoThem = pKill->Noto_GetFlag( this, false );
-
 	// Fight is over now that i have won. (if i was fighting at all )
 	// ie. Magery cast might not be a "fight"
 	Fight_Clear(pKill);
 	if ( pKill == this )
 		return;
 
+	// What was their noto to me ?
+	NOTO_TYPE NotoThem = pKill->Noto_GetFlag( this, false );
+	
 	if ( m_pNPC )
 	{
 		if ( pKill->m_pNPC )
diff --git a/src/game/chars/CCharSkill.cpp b/src/game/chars/CCharSkill.cpp
index 6a9c23849..3936a9171 100644
--- a/src/game/chars/CCharSkill.cpp
+++ b/src/game/chars/CCharSkill.cpp
@@ -3963,7 +3963,9 @@ int CChar::Skill_Snooping(SKTRIG_TYPE stage)
 	if (!IsTakeCrime(pCont, &pCharMark) || pCharMark == nullptr)
 		return 0;	// Not a crime really.
 
-	if (GetTopDist3D(pCharMark) > 1)
+	CSkillDef *pSkillDef = g_Cfg.GetSkillDef(SKILL_SNOOPING);
+	int iMaxRange = pSkillDef->m_Range ? pSkillDef->m_Range : 1;
+	if (GetTopDist3D(pCharMark) > iMaxRange)
 	{
 		SysMessageDefault(DEFMSG_SNOOPING_REACH);
 		return (-SKTRIG_QTY);
diff --git a/src/game/clients/CClientEvent.cpp b/src/game/clients/CClientEvent.cpp
index f410b4e79..3329ce696 100644
--- a/src/game/clients/CClientEvent.cpp
+++ b/src/game/clients/CClientEvent.cpp
@@ -411,7 +411,6 @@ void CClient::Event_Item_Drop( CUID uidItem, CPointMap pt, CUID uidOn, uchar gri
 			}
 		}
 
-		CObjBase *pOldCont = pItem->GetContainer();
 		if (( IsTrigUsed(TRIGGER_DROPON_ITEM) ) || ( IsTrigUsed(TRIGGER_ITEMDROPON_ITEM) ))
 		{
 			CScriptTriggerArgs Args( pObjOn );
@@ -422,9 +421,6 @@ void CClient::Event_Item_Drop( CUID uidItem, CPointMap pt, CUID uidOn, uchar gri
 			}
 		}
 
-		if ( pOldCont != pItem->GetContainer() )
-			return;
-
 		CItem * pItemOn = dynamic_cast <CItem*> ( pObjOn );
 		if (( pItemOn ) && (( IsTrigUsed(TRIGGER_DROPON_SELF) ) || ( IsTrigUsed(TRIGGER_ITEMDROPON_SELF) )))
 		{
@@ -547,7 +543,6 @@ void CClient::Event_Item_Drop( CUID uidItem, CPointMap pt, CUID uidOn, uchar gri
 	}
 
 	// do the dragging anim for everyone else to see.
-
 	if ( pObjOn != nullptr )
 	{
 		// in pack or other CItemContainer.