diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm
index c6078c10ac..6522aae611 100644
--- a/code/_onclick/ai.dm
+++ b/code/_onclick/ai.dm
@@ -124,8 +124,7 @@
 	Topic("breaker=1", list("breaker"="1"), 0) // 0 meaning no window (consistency! wait...)
 
 /obj/machinery/turretid/AICtrlClick() //turns off/on Turrets
-	src.enabled = !src.enabled
-	src.updateTurrets()
+	Topic("toggleOn", list("toggleOn" = 1), 1) // 1 meaning no window (consistency!)
 
 /atom/proc/AIAltClick(var/atom/A)
 	AltClick(A)
@@ -140,8 +139,7 @@
 	return
 
 /obj/machinery/turretid/AIAltClick() //toggles lethal on turrets
-	src.lethal = !src.lethal
-	src.updateTurrets()
+	Topic("toggleLethal", list("toggleLethal" = 1), 1) // 1 meaning no window (consistency!)
 
 /atom/proc/AIMiddleClick()
 	return
diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm
index 98af795ca8..5ad0ecae56 100644
--- a/code/game/machinery/turrets.dm
+++ b/code/game/machinery/turrets.dm
@@ -436,8 +436,9 @@
 
 
 
-/obj/machinery/turretid/Topic(href, href_list)
-	..()
+/obj/machinery/turretid/Topic(href, href_list, var/nowindow = 0)
+	if(..(href, href_list))
+		return
 	if (src.locked)
 		if (!istype(usr, /mob/living/silicon))
 			usr << "Control panel is locked!"
@@ -449,7 +450,8 @@
 		else if (href_list["toggleLethal"])
 			src.lethal = !src.lethal
 			src.updateTurrets()
-	src.attack_hand(usr)
+	if(!nowindow)
+		src.attack_hand(usr)
 
 /obj/machinery/turretid/proc/updateTurrets()
 	if(control_area)