diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 899b16cf2ef..b22b813d1c1 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -75,6 +75,8 @@
 		L += G.gift
 		if (istype(G.gift, /obj/item/weapon/storage))
 			L += G.gift:return_inv()
+	for(var/obj/item/weapon/folder/F in src)
+		L += F.contents
 	return L
 
 /obj/item/weapon/storage/proc/show_to(mob/user as mob)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 9f228068ab3..15991b13201 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -229,6 +229,9 @@
 			L += D.wrapped
 			if(istype(D.wrapped, /obj/item/weapon/storage)) //this should never happen
 				L += get_contents(D.wrapped)
+		for(var/obj/item/weapon/folder/F in src.contents)
+			L += F.contents //Folders can't store any storage items.
+
 		return L
 
 /mob/living/proc/check_contents_for(A)