diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
index 5a07372252c..cf97e5ab7dd 100644
--- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
+++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
@@ -661,6 +661,9 @@ public class ComputerPlayer extends PlayerImpl implements Player {
 
         // TODO: implemented findBestPlayerTargets
         // TODO: add findBest*Targets for all target types
+        // TODO: Much of this code needs to be re-written to move code into Target.possibleTargets
+        //       A) Having it here makes this function ridiculously long
+        //       B) Each time a new target type is added, people must remember to add it here
         if (target.getOriginalTarget() instanceof TargetPermanent) {
 
             FilterPermanent filter = null;
@@ -1043,6 +1046,15 @@ public class ComputerPlayer extends PlayerImpl implements Player {
             return target.isChosen();
         }
 
+        if (target.getOriginalTarget() instanceof TargetActivatedOrTriggeredAbility
+                || target.getOriginalTarget() instanceof TargetActivatedOrTriggeredAbilityOrLegendarySpell) {
+            Iterator<UUID> iterator = target.possibleTargets(source.getControllerId(), source, game).iterator();
+            while (!target.isChosen() && iterator.hasNext()) {
+                target.addTarget(iterator.next(), source, game);
+            }
+            return target.isChosen();
+        }
+
         if (target.getOriginalTarget() instanceof TargetCardInGraveyardBattlefieldOrStack) {
             List<Card> cards = new ArrayList<>();
             for (Player player : game.getPlayers().values()) {