diff --git a/code/modules/reagents/dartgun.dm b/code/modules/reagents/dartgun.dm
index 9d206e65965..5481dc22a15 100644
--- a/code/modules/reagents/dartgun.dm
+++ b/code/modules/reagents/dartgun.dm
@@ -207,7 +207,9 @@
 /obj/item/weapon/gun/dartgun/can_hit(var/mob/living/target as mob, var/mob/living/user as mob)
 	return 1
 
-/obj/item/weapon/gun/dartgun/attack_self(user as mob)
+/obj/item/weapon/gun/dartgun/attack_self(mob/user)
+
+	user.set_machine(src)
 	var/dat = "<b>[src] mixing control:</b><br><br>"
 
 	if (beakers.len)
@@ -235,7 +237,8 @@
 			dat += "<font color='red'>The dart cartridge is empty!</font>"
 		dat += " \[<A href='?src=\ref[src];eject_cart=1'>Eject</A>\]"
 
-	user << browse("[dat]", "window=dartgun_mixing_window")
+	user << browse(dat, "window=dartgun")
+	onclose(user, "dartgun", src)
 
 /obj/item/weapon/gun/dartgun/proc/check_beaker_mixing(var/obj/item/B)
 	if(!mixing || !beakers)