diff --git a/src/phases.ts b/src/phases.ts
index 7aacf0ad6ac..dcd5ba29b11 100644
--- a/src/phases.ts
+++ b/src/phases.ts
@@ -2207,17 +2207,23 @@ export class MovePhase extends BattlePhase {
     }
 
     // Move redirection abilities (ie. Storm Drain) only support single target moves
-    const moveTarget = this.targets.length === 1
-      ? new Utils.IntegerHolder(this.targets[0])
-      : null;
+      const moveTarget = this.targets.length === 1
+          ? new Utils.IntegerHolder(this.targets[0])
+          : null;
       if (moveTarget) {
-	  //If user has an ability preventing moves from being redirected, or is using a move that can not be redirected (i.e. Snipe Shot), don't redirect it.
-          if (!(this.pokemon.hasAbilityWithAttr(BlockRedirectAbAttr) || this.move.getMove().getAttrs(BypassRedirectAttr).length) )
-          {
-            this.scene.getField(true).filter(p => p !== this.pokemon).forEach(p => applyAbAttrs(RedirectMoveAbAttr, p, null, this.move.moveId, moveTarget));
+          var oldTarget = moveTarget.value;
+          this.scene.getField(true).filter(p => p !== this.pokemon).forEach(p => applyAbAttrs(RedirectMoveAbAttr, p, null, this.move.moveId, moveTarget));
+          //Check if this move is immune to being redirected, and restore its target to the intended target if it is.
+          if ((this.pokemon.hasAbilityWithAttr(BlockRedirectAbAttr) || this.move.getMove().getAttrs(BypassRedirectAttr).length)) {
+              //If an ability prevented this move from being redirected, display its ability pop up.
+              if ((this.pokemon.hasAbilityWithAttr(BlockRedirectAbAttr) && !this.move.getMove().getAttrs(BypassRedirectAttr).length) && oldTarget != moveTarget.value) {
+                  this.scene.unshiftPhase(new ShowAbilityPhase(this.scene, this.pokemon.getBattlerIndex(), this.pokemon.getPassiveAbility().hasAttr(BlockRedirectAbAttr)));
+              }
+              moveTarget.value = oldTarget;
           }
-      this.targets[0] = moveTarget.value;
-    }
+          this.targets[0] = moveTarget.value;
+      }
+
 
     if (this.targets.length === 1 && this.targets[0] === BattlerIndex.ATTACKER) {
       if (this.pokemon.turnData.attacksReceived.length) {