diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm
index 474e3b66e28..ae4a147f702 100644
--- a/code/game/machinery/doors/multi_tile.dm
+++ b/code/game/machinery/doors/multi_tile.dm
@@ -2,6 +2,15 @@
 /obj/machinery/door/airlock/multi_tile
 	width = 2
 
+/obj/machinery/door/airlock/multi_tile/New()
+	..()
+	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'
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index 7e3c853750f..b4281a6033a 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -223,7 +223,7 @@
 			user << "<span class='notice'>There was nothing to remove.</span>"
 			src.state = 1
 			return
-	
+
 		playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
 		user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove the electronics from the airlock assembly.")
 
@@ -271,7 +271,8 @@
 			else
 				path = text2path("/obj/machinery/door/airlock[airlock_type]")
 
-			new path(src.loc, src)
+			var/obj/machinery/door/new_airlock = new path(src.loc, src)
+			new_airlock.dir = src.dir
 			del(src)
 	else
 		..()