diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm
index b7c2d5b3f9a..c2c6015747e 100644
--- a/code/game/objects/items/stacks/sheets/light.dm
+++ b/code/game/objects/items/stacks/sheets/light.dm
@@ -14,23 +14,22 @@
 	grind_results = list("silicon" = 20, "copper" = 5)
 
 /obj/item/stack/light_w/attackby(obj/item/O, mob/user, params)
-	var/atom/Tsec = user.drop_location()
-	if(istype(O, /obj/item/wirecutters))
-		var/obj/item/stack/cable_coil/CC = new (Tsec, 5)
-		CC.add_fingerprint(user)
-		amount--
-		var/obj/item/stack/sheet/glass/G = new (Tsec)
-		G.add_fingerprint(user)
-		if(amount <= 0)
-			qdel(src)
-
-	else if(istype(O, /obj/item/stack/sheet/metal))
+	if(istype(O, /obj/item/stack/sheet/metal))
 		var/obj/item/stack/sheet/metal/M = O
 		if (M.use(1))
-			var/obj/item/L = new /obj/item/stack/tile/light(user.loc)
+			var/obj/item/L = new /obj/item/stack/tile/light(user.drop_location())
 			to_chat(user, "<span class='notice'>You make a light tile.</span>")
 			L.add_fingerprint(user)
+			use(1)
 		else
 			to_chat(user, "<span class='warning'>You need one metal sheet to finish the light tile!</span>")
 	else
 		return ..()
+
+/obj/item/stack/light_w/wirecutter_act(mob/living/user, obj/item/I)
+	var/atom/Tsec = user.drop_location()
+	var/obj/item/stack/cable_coil/CC = new (Tsec, 5)
+	CC.add_fingerprint(user)
+	var/obj/item/stack/sheet/glass/G = new (Tsec)
+	G.add_fingerprint(user)
+	use(1)