diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 6febd674bc..c2114e6bc1 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1358,7 +1358,7 @@
 													datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "ai_airlock", name, 550, 430, master_ui, state)
+		ui = new(user, src, ui_key, "ai_airlock", name, 550, 456, master_ui, state)
 		ui.open()
 
 /obj/machinery/door/airlock/ui_data()
@@ -1381,6 +1381,8 @@
 	data["lights"] = lights // bolt lights
 	data["safe"] = safe // safeties
 	data["speed"] = normalspeed // safe speed
+	data["welded"] = welded // welded
+	data["opened"] = !density // opened
 
 	var/list/wire = list()
 	wire["main_1"] = !wires.is_cut(WIRE_POWER1)
diff --git a/tgui/src/interfaces/ai_airlock.ract b/tgui/src/interfaces/ai_airlock.ract
index 5014bb8932..3acd384617 100644
--- a/tgui/src/interfaces/ai_airlock.ract
+++ b/tgui/src/interfaces/ai_airlock.ract
@@ -66,14 +66,6 @@ component.exports = {
 	</ui-section>
 </ui-display>
 <ui-display title='Access & Door Control'>
-	<ui-section label='Open'>
-		{{#if data.welded}}
-			[ <span class="bad">Door has been welded</span> ]
-		{{/if}}
-		<div style='float:right'>
-			<ui-button icon='sign-out' action='open-close' style='{{data.density ? "selected" : ""}}'>Toggle</ui-button>
-		</div>
-	</ui-section>
 	<ui-section label='ID Scan'>
 		{{#if !data.wires.id_scanner}}
 			[ <span class="bad">Wires have been cut</span> ]
@@ -126,4 +118,14 @@ component.exports = {
 			<ui-button state='{{!data.wires.timing}}' icon='close' action='speed-off' style='{{data.speed ? "" : "selected"}}'>Disabled</ui-button>
 		</div>
 	</ui-section>
+	<br />
+	<ui-section label='Door control'>
+		{{#if data.locked || data.welded}}
+			[ <span class="bad">Door is {{(data.locked ? "bolted" : "") + (data.locked && data.welded ? " and " : "") + (data.welded ? "welded" : "")}}</span> ]
+		{{/if}}
+		<div style='float:right'>
+			<ui-button state='{{(data.locked || data.welded) || (data.opened && "disabled")}}' icon='sign-out' action='open-close'>Open door</ui-button>
+			<ui-button state='{{(data.locked || data.welded) || (!data.opened && "disabled")}}' icon='sign-in' action='open-close'>Close door</ui-button>
+		</div>
+	</ui-section>
 </ui-display>