diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 501bf30431f..515473cb1e1 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -14,6 +14,14 @@
 */
 /atom/Click(location,control,params)
 	usr.ClickOn(src, params)
+
+/mob/living/Click()
+	if(isAI(usr))
+		var/mob/living/silicon/ai/A = usr
+		if(!A.aicamera.in_camera_mode) //Fix for taking photos of mobs
+			return
+	..()
+
 /atom/DblClick(location,control,params)
 	usr.DblClickOn(src,params)
 
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index 3d86a9b6110..783bb916fc5 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -79,11 +79,6 @@
 			if (isturf(src.loc) || isturf(src))
 				AI.eyeobj.forceMove(src)
 
-/mob/living/silicon/ai/Click()
-	if(!aicamera.in_camera_mode) //Fix for taking photos of mobs
-		return
-	..()
-
 // This will move the AIEye. It will also cause lights near the eye to light up, if toggled.
 // This is handled in the proc below this one.