diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm
index a91d1e10f62..b3736a22620 100644
--- a/code/game/objects/items/weapons/storage/secure.dm
+++ b/code/game/objects/items/weapons/storage/secure.dm
@@ -83,13 +83,21 @@
 			to_chat(user, "You short out the lock on [src].")
 		return
 
+/obj/item/storage/secure/AltClick(mob/user)
+	if(!try_to_open())
+		return FALSE
+	return ..()
 
 /obj/item/storage/secure/MouseDrop(over_object, src_location, over_location)
+	if(!try_to_open())
+		return FALSE
+	return ..()
+
+/obj/item/storage/secure/proc/try_to_open()
 	if(locked)
 		add_fingerprint(usr)
 		to_chat(usr, "<span class='warning'>It's locked!</span>")
-		return 0
-	..()
+		return FALSE
 
 /obj/item/storage/secure/attack_self(mob/user as mob)
 	user.set_machine(src)
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index e99a79abd9b..7cefb4dfd59 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -83,7 +83,7 @@
 	return
 
 /obj/item/storage/AltClick(mob/user)
-	if(Adjacent(user))
+	if(Adjacent(user) && !user.incapacitated(FALSE, TRUE, TRUE))
 		orient2hud(user)
 		if(user.s_active)
 			user.s_active.close(user)