diff --git a/code/modules/mob/screen.dm b/code/modules/mob/screen.dm
index b9767c3a299..15d1cb20cba 100644
--- a/code/modules/mob/screen.dm
+++ b/code/modules/mob/screen.dm
@@ -62,9 +62,11 @@
 	name = "storage"
 	master = null
 
-/obj/screen/storage/attackby(W, mob/user as mob)
-	src.master.attackby(W, user)
-	return
+/obj/screen/storage/attack_hand(mob/user)
+	if(master)
+		var/obj/item/I = user.get_active_hand()
+		if(I)
+			master.attackby(I, user)
 
 /obj/screen/zone_sel
 	name = "Damage Zone"