diff --git a/code/game/atom_procs.dm b/code/game/atom_procs.dm
index b215e6c1877..a15382849f3 100644
--- a/code/game/atom_procs.dm
+++ b/code/game/atom_procs.dm
@@ -573,7 +573,7 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl
 
 	// ------- DIR CHANGING WHEN CLICKING (changes facting direction) ------
 
-	if( usr && iscarbon(usr) )
+	if( usr && iscarbon(usr) && !usr.buckled )
 		if( src.x && src.y && usr.x && usr.y )
 			var/dx = src.x - usr.x
 			var/dy = src.y - usr.y
@@ -586,6 +586,15 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl
 				usr.dir = 4
 			if( dx < 0 && abs(dy) <= abs(dx) ) //West
 				usr.dir = 8
+			if( dx == 0 && dy == 0 )
+				if(src.pixel_y > 16)
+					usr.dir = 1
+				if(src.pixel_y < -16)
+					usr.dir = 2
+				if(src.pixel_x > 16)
+					usr.dir = 4
+				if(src.pixel_x < -16)
+					usr.dir = 8
 
 	// ------- SHIFT-CLICK -------