diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 5da1c42e83c..e06cfa5b42f 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -156,7 +156,10 @@
 	else
 		if(W)
 			if(modifiers["right"])
-				W.afterattack_secondary(A,src,0,params)
+				var/after_attack_secondary_result = W.afterattack_secondary(A, src, FALSE, params)
+
+				if(after_attack_secondary_result == SECONDARY_ATTACK_CALL_NORMAL)
+					W.afterattack(A, src, FALSE, params)
 			else
 				W.afterattack(A,src,0,params)
 		else