diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 15d2848cd2..51af8837a8 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1019,6 +1019,9 @@ About the new airlock wires panel:
 		else
 			name = "[istext(assembly.glass) ? "[assembly.glass] airlock" : assembly.base_name]"
 
+		//get the dir from the assembly
+		set_dir(assembly.dir)
+
 	//wires
 	var/turf/T = get_turf(newloc)
 	if(T && (T.z in config.admin_levels))
diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm
index a2d599fa00..4fc4b2fad7 100644
--- a/code/game/machinery/doors/multi_tile.dm
+++ b/code/game/machinery/doors/multi_tile.dm
@@ -4,17 +4,23 @@
 
 /obj/machinery/door/airlock/multi_tile/New()
 	..()
-	switch(dir)
-		if(EAST, WEST)
-			bound_width = width * world.icon_size
-			bound_height = world.icon_size
-		else
-			bound_width = world.icon_size
-			bound_height = width * world.icon_size
+	SetBounds()
+
+/obj/machinery/door/airlock/multi_tile/Move()
+	. = ..()
+	SetBounds()
+
+/obj/machinery/door/airlock/multi_tile/proc/SetBounds()
+	if(dir in list(EAST, WEST))
+		bound_width = width * world.icon_size
+		bound_height = world.icon_size
+	else
+		bound_width = world.icon_size
+		bound_height = width * world.icon_size
 
 /obj/machinery/door/airlock/multi_tile/glass
 	name = "Glass Airlock"
 	icon = 'icons/obj/doors/Door2x1glass.dmi'
 	opacity = 0
 	glass = 1
-	assembly_type = /obj/structure/door_assembly/multi_tile
\ No newline at end of file
+	assembly_type = /obj/structure/door_assembly/multi_tile
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index cd859b1489..89e841bc58 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -282,8 +282,7 @@
 			else
 				path = text2path("/obj/machinery/door/airlock[airlock_type]")
 
-			var/obj/machinery/door/new_airlock = new path(src.loc, src)
-			new_airlock.dir = src.dir
+			new path(src.loc, src)
 			qdel(src)
 	else
 		..()