diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index ab7100ce33..b3657ba3d3 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -23,6 +23,7 @@
 			if(sleepernew)
 				sleeper = sleepernew
 				sleepernew.console = src
+				set_dir(get_dir(src, sleepernew))
 				return
 		return
 
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index a236b0dc50..2d80766ea6 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -227,9 +227,11 @@
 		// Loop through every direction
 		for(dir in list(NORTH, EAST, SOUTH, WEST)) // Loop through every direction
 			bodyscannernew = locate(/obj/machinery/bodyscanner, get_step(src, dir)) // Try to find a scanner in that direction
-		if(bodyscannernew)
-			scanner = bodyscannernew
-			bodyscannernew.console = src
+			if(bodyscannernew)
+				scanner = bodyscannernew
+				bodyscannernew.console = src
+				set_dir(get_dir(src, bodyscannernew))
+				return
 		return
 
 /obj/machinery/body_scanconsole/attack_ai(user as mob)