diff --git a/code/modules/projectiles/targeting/targeting_overlay.dm b/code/modules/projectiles/targeting/targeting_overlay.dm
index 8c87751de7..2b882ed191 100644
--- a/code/modules/projectiles/targeting/targeting_overlay.dm
+++ b/code/modules/projectiles/targeting/targeting_overlay.dm
@@ -107,8 +107,10 @@ obj/aiming_overlay/proc/update_aiming_deferred()
 		cancel_aiming()
 		return
 
-	if(!locked && lock_time >= world.time)
+	if(!locked && lock_time <= world.time)
 		locked = 1
+		owner << "<span class ='notice'>You are locked onto your target.</span>"
+		aiming_at << "<span class='danger'>The gun is trained on you!</span>"
 		update_icon()
 
 	var/cancel_aim = 1
diff --git a/code/modules/projectiles/targeting/targeting_triggers.dm b/code/modules/projectiles/targeting/targeting_triggers.dm
index 2544fae913..188440dcf6 100644
--- a/code/modules/projectiles/targeting/targeting_triggers.dm
+++ b/code/modules/projectiles/targeting/targeting_triggers.dm
@@ -27,3 +27,5 @@
 	var/obj/item/weapon/gun/G = aiming_with
 	if(istype(G))
 		G.Fire(aiming_at, owner, reflex = 1)
+		locked = 0
+		lock_time = world.time+10