diff --git a/Mage.Sets/src/mage/cards/a/ArachnePsionicWeaver.java b/Mage.Sets/src/mage/cards/a/ArachnePsionicWeaver.java
index d80351d2164..7e628aab485 100644
--- a/Mage.Sets/src/mage/cards/a/ArachnePsionicWeaver.java
+++ b/Mage.Sets/src/mage/cards/a/ArachnePsionicWeaver.java
@@ -4,6 +4,7 @@ import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.AsEntersBattlefieldAbility;
 import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.OneShotNonTargetEffect;
 import mage.abilities.effects.common.ChooseCardTypeEffect;
 import mage.abilities.effects.common.LookAtTargetPlayerHandEffect;
 import mage.abilities.effects.common.cost.SpellsCostIncreasingAllEffect;
@@ -45,14 +46,14 @@ public final class ArachnePsionicWeaver extends CardImpl {
         // Web-slinging {W}
         this.addAbility(new WebSlingingAbility(this, "{W}"));
 
-        // As Arachne enters, look at target opponent's hand, then choose a noncreature card type.
+        // As Arachne enters, look at an opponent’s hand, then choose a card type other than creature.
         List<CardType> types = Arrays.stream(CardType.values()).filter(cardType -> cardType != CardType.CREATURE)
                 .collect(Collectors.toList());
-        Ability ability = new AsEntersBattlefieldAbility(new LookAtTargetPlayerHandEffect());
+        Ability ability = new AsEntersBattlefieldAbility(new OneShotNonTargetEffect(
+                new LookAtTargetPlayerHandEffect().setText("look at an opponent's hand"), new TargetOpponent()));
         ability.addEffect(new ChooseCardTypeEffect(Outcome.Benefit, types)
-                .setText("choose a noncreature card type")
+                .setText("choose a card type other than creature")
                 .concatBy(", then"));
-        ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
 
         // Spells of the chosen type cost {1} more to cast.
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/spm/ArachnePsionicWeaverTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/spm/ArachnePsionicWeaverTest.java
index a210814861c..254b11c3ec0 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/single/spm/ArachnePsionicWeaverTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/spm/ArachnePsionicWeaverTest.java
@@ -42,6 +42,7 @@ public class ArachnePsionicWeaverTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerB, "Plains");
 
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, arachnePsionicWeaver);
+        setChoice(playerA, playerB.getName());
         setChoice(playerA, CardType.ARTIFACT.toString());
 
         checkPlayableAbility("Player A can't cast Tormod's", 1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Cast " + tormodsCrypt, false);
@@ -50,4 +51,4 @@ public class ArachnePsionicWeaverTest extends CardTestPlayerBase {
         setStopAt(2, PhaseStep.PRECOMBAT_MAIN);
         execute();
     }
-}
\ No newline at end of file
+}