diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index f2f65f91288..f8d9ebbbab9 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -343,7 +343,7 @@
 /atom/proc/AltClick(mob/user)
 	SEND_SIGNAL(src, COMSIG_CLICK_ALT, user)
 	var/turf/T = get_turf(src)
-	if(T && user.TurfAdjacent(T))
+	if(T && (isturf(loc) || isturf(src)) && user.TurfAdjacent(T))
 		user.listed_turf = T
 		user.client.statpanel = T.name