From 65d62026b0134e6682014a7b360946d7bfb4eb95 Mon Sep 17 00:00:00 2001
From: Michael Johnson <nightexcessive@gmail.com>
Date: Tue, 3 Dec 2013 13:53:52 -0500
Subject: [PATCH] Fixes #2355

---
 code/modules/power/apc.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 599d2517236..bb3bbcdb3dc 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -800,7 +800,8 @@
 		if(!can_use(usr, 1))
 			return
 	src.add_fingerprint(usr)
-	usr.set_machine(src)
+	if(usingUI) // If we set their machine and they're not using the UI, it'll cause the UI to pop up.
+		usr.set_machine(src)
 	if (href_list["apcwires"])
 		var/t1 = text2num(href_list["apcwires"])
 		if (!( istype(usr.get_active_hand(), /obj/item/weapon/wirecutters) ))