From 1aab4b321277b341aeed9052fa8d4d582b8f3994 Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Sat, 28 Mar 2026 02:47:26 +0100
Subject: [PATCH] .

---
 module/macros/spotlightCombatant.mjs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/module/macros/spotlightCombatant.mjs b/module/macros/spotlightCombatant.mjs
index 43f87d1f..c94a0bbc 100644
--- a/module/macros/spotlightCombatant.mjs
+++ b/module/macros/spotlightCombatant.mjs
@@ -12,8 +12,12 @@ const spotlightCombatantMacro = async token => {
     );
     if (combatantCombat) {
         const combatant = combatantCombat.combatants.find(x => x.token.id === token.document.id);
-        if (!combatantCombat.active) await combatantCombat.activate();
-        if (combatantCombat.combatant?.id !== combatant.id) ui.combat.setCombatantSpotlight(combatant.id);
+        if (!combatantCombat.active) {
+            await combatantCombat.activate();
+            if (combatantCombat.combatant?.id !== combatant.id) ui.combat.setCombatantSpotlight(combatant.id);
+        } else {
+            ui.combat.setCombatantSpotlight(combatant.id);
+        }
     } else {
         if (game.combat) await ui.combat.clearTurn();