diff --git a/code/datums/storage/storage.dm b/code/datums/storage/storage.dm
index 96233e59405..856c1204c72 100644
--- a/code/datums/storage/storage.dm
+++ b/code/datums/storage/storage.dm
@@ -693,10 +693,12 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
 /datum/storage/proc/on_preattack(datum/source, obj/item/thing, mob/user, params)
 	SIGNAL_HANDLER
 
-	if(!istype(thing) || !allow_quick_gather || thing.atom_storage)
+	if(!istype(thing) || thing == parent.loc || !allow_quick_gather || thing.atom_storage)
 		return
 
 	if(collection_mode == COLLECT_ONE)
+		if(thing.loc == user)
+			user.dropItemToGround(thing, silent = TRUE) //this is nessassary to update any inventory slot it is attached to
 		attempt_insert(thing, user)
 		return COMPONENT_CANCEL_ATTACK_CHAIN
 
diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm
index c81852958b4..59e2f0feb86 100644
--- a/code/modules/detectivework/evidence.dm
+++ b/code/modules/detectivework/evidence.dm
@@ -18,23 +18,13 @@
 		max_slots = 1,
 		max_specific_storage = WEIGHT_CLASS_NORMAL,
 	)
+	atom_storage.allow_quick_gather = TRUE
+	atom_storage.collection_mode = COLLECT_ONE
 	RegisterSignal(atom_storage, COMSIG_STORAGE_STORED_ITEM, PROC_REF(on_insert))
 	RegisterSignal(atom_storage, COMSIG_STORAGE_REMOVED_ITEM, PROC_REF(on_remove))
 	atom_storage.rustle_sound = 'sound/items/evidence_bag/evidence_bag_zip.ogg'
 	atom_storage.remove_rustle_sound = 'sound/items/evidence_bag/evidence_bag_unzip.ogg'
 
-/obj/item/evidencebag/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
-	if(interacting_with == loc || !isitem(interacting_with) || HAS_TRAIT(interacting_with, TRAIT_COMBAT_MODE_SKIP_INTERACTION))
-		return NONE
-	if(atom_storage.attempt_insert(interacting_with, user))
-		return ITEM_INTERACT_SUCCESS
-	return NONE
-
-/obj/item/evidencebag/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
-	if(atom_storage.attempt_insert(tool, user))
-		return ITEM_INTERACT_SUCCESS
-	return NONE
-
 /obj/item/evidencebag/update_desc(updates)
 	. = ..()
 	if(!atom_storage.get_total_weight())
@@ -65,12 +55,15 @@
 
 /obj/item/evidencebag/proc/on_insert(datum/storage/storage, obj/item/to_insert, mob/user, force)
 	SIGNAL_HANDLER
+
 	update_weight_class(to_insert.w_class)
 
 /obj/item/evidencebag/proc/on_remove(datum/storage/storage, obj/item/to_remove, atom/remove_to_loc, silent)
 	SIGNAL_HANDLER
+
 	if(!atom_storage.get_total_weight())
 		return
+
 	update_weight_class(WEIGHT_CLASS_TINY)
 
 /obj/item/evidencebag/attack_self(mob/user)