diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 9887830364..4192a44150 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -65,7 +65,7 @@
 /obj/structure/proc/do_climb(atom/movable/A)
 	if(climbable)
 		density = FALSE
-		. = step(A,get_dir(A,src.loc))
+		. = step(A, (A.loc == loc ? dir : get_dir(A,src.loc)))
 		density = TRUE
 
 /obj/structure/proc/climb_structure(mob/living/user)