diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index a3c0a0a8290..3c7772cf4ad 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -42,7 +42,7 @@
 
 
 /obj/structure/closet/body_bag/attackby(obj/item/I, mob/user, params)
-	if (istype(I, /obj/item/weapon/pen))
+	if (istype(I, /obj/item/weapon/pen) || istype(I, /obj/item/toy/crayon))
 		var/t = stripped_input(user, "What would you like the label to be?", name, null, 53)
 		if(user.get_active_hand() != I)
 			return
@@ -62,6 +62,11 @@
 		overlays.Cut()
 		tagged = 0
 
+/obj/structure/closet/body_bag/update_icon()
+	..()
+	if (tagged)
+		overlays += "bodybag_label"
+
 
 /obj/structure/closet/body_bag/close()
 	if(..())
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index b43e760fe09..bb209cb9515 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -46,10 +46,6 @@
 					overlays += "unlocked"
 			else
 				overlays += "off"
-		if(istype(src, /obj/structure/closet/body_bag)) // GUESS WHAT BODY BAGS ARE CLOSETS
-			var/obj/structure/closet/body_bag/B = src
-			if (B.tagged)
-				overlays += "bodybag_label"
 
 	else
 		if(icon_door_override)