diff --git a/code/_onclick/ai_onclick.dm b/code/_onclick/ai_onclick.dm
index a608dc630cd..2e11117c078 100644
--- a/code/_onclick/ai_onclick.dm
+++ b/code/_onclick/ai_onclick.dm
@@ -59,10 +59,11 @@
 	if(modifiers["shift"])
 		if(isturf(A))
 			var/turf/clicked_turf = A
-			for(var/obj/machinery/door/AL in clicked_turf.contents)
+			var/obj/machinery/door/AL = locate() in clicked_turf.contents
+			if(AL)
 				AL.try_to_activate_door(src)
-		else
-			ShiftClickOn(A)
+				return
+		ShiftClickOn(A)
 		return
 	if(modifiers["alt"]) // alt and alt-gr (rightalt)
 		AltClickOn(A)
diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
index 9714a8585b9..f8e34246520 100644
--- a/code/_onclick/cyborg.dm
+++ b/code/_onclick/cyborg.dm
@@ -39,10 +39,11 @@
 	if(modifiers["shift"])
 		if(isturf(A))
 			var/turf/clicked_turf = A
-			for(var/obj/machinery/door/AL in clicked_turf.contents)
+			var/obj/machinery/door/AL = locate() in clicked_turf.contents
+			if(AL)
 				AL.try_to_activate_door(src)
-		else
-			ShiftClickOn(A)
+				return
+		ShiftClickOn(A)
 		return
 	if(modifiers["alt"]) // alt and alt-gr (rightalt)
 		AltClickOn(A)