diff --git a/Mage.Sets/src/mage/cards/g/GideonBlackblade.java b/Mage.Sets/src/mage/cards/g/GideonBlackblade.java
index 74a3ea2dc5b..c45c68e9be3 100644
--- a/Mage.Sets/src/mage/cards/g/GideonBlackblade.java
+++ b/Mage.Sets/src/mage/cards/g/GideonBlackblade.java
@@ -55,7 +55,7 @@ public final class GideonBlackblade extends CardImpl {
         // As long as it's your turn, Gideon Blackblade is a 4/4 Human Soldier creature with indestructible that's still a planeswalker.
         this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(
                 new BecomesCreatureSourceEffect(
-                        new GideonBlackbladeToken(), "planeswalker", Duration.EndOfTurn
+                        new GideonBlackbladeToken(), "planeswalker", Duration.WhileOnBattlefield
                 ), MyTurnCondition.instance, "As long as it's your turn, " +
                 "{this} is a 4/4 Human Soldier creature with indestructible that's still a planeswalker."
         )));