diff --git a/code/modules/turbolift/turbolift.dm b/code/modules/turbolift/turbolift.dm
index b00dfe2253..0ca172e7e9 100644
--- a/code/modules/turbolift/turbolift.dm
+++ b/code/modules/turbolift/turbolift.dm
@@ -17,6 +17,7 @@
 	queued_floors.Cut()
 	target_floor = null
 	open_doors()
+	control_panel_interior.updateDialog()
 
 /datum/turbolift/proc/doors_are_open(var/datum/turbolift_floor/use_floor = current_floor)
 	for(var/obj/machinery/door/airlock/door in (use_floor ? (doors + use_floor.doors) : doors))
@@ -51,6 +52,7 @@
 			moving_upwards = 1
 		else
 			moving_upwards = 0
+		control_panel_interior.updateDialog()
 
 	if(doors_are_open())
 		if(!doors_closing)
diff --git a/code/modules/turbolift/turbolift_console.dm b/code/modules/turbolift/turbolift_console.dm
index d86c86bdd5..a30aa9be39 100644
--- a/code/modules/turbolift/turbolift_console.dm
+++ b/code/modules/turbolift/turbolift_console.dm
@@ -123,6 +123,7 @@
 	dat += "<a href='?src=\ref[src];emergency_stop=1'>Emergency Stop</a>"
 	dat += "<hr></body></html>"
 
+	user.set_machine(src)
 	var/datum/browser/popup = new(user, "turbolift_panel", "Lift Panel", 350, 320) //VOREStation Edit - Wider!
 	popup.set_content(jointext(dat, null))
 	popup.open()
@@ -149,6 +150,7 @@
 
 	if(panel_interact)
 		pressed(usr)
+		updateDialog()
 
 	return 0