diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm
index f83aa6c2d19..fe11fb5ee5a 100644
--- a/code/_onclick/ai.dm
+++ b/code/_onclick/ai.dm
@@ -69,8 +69,8 @@
 		aicamera.captureimage(A, usr)
 		return
 	if(waypoint_mode)
-		set_waypoint(A)
 		waypoint_mode = 0
+		set_waypoint(A)
 		return
 
 	/*