diff --git a/res/cardsfolder/d/diregraf_escort.txt b/res/cardsfolder/d/diregraf_escort.txt
index 2b9d82c0941..57df5ec9ebd 100644
--- a/res/cardsfolder/d/diregraf_escort.txt
+++ b/res/cardsfolder/d/diregraf_escort.txt
@@ -3,6 +3,6 @@ ManaCost:G
 Types:Creature Human Cleric
 PT:1/1
 K:Soulbond
-S:Mode$ Continuous | Affected$ Creature.PairedWith,Creature.Self+Paired | AddKeyword$ Protection from Zombies | Description$ As long as CARDNAME is paired with another creature, both creatures have protection from Zombies.
+S:Mode$ Continuous | Affected$ Creature.PairedWith,Creature.Self+Paired | AddKeyword$ Protection:Zombie:Protection from Zombies | Description$ As long as CARDNAME is paired with another creature, both creatures have protection from Zombies.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/diregraf_escort.jpg
 Oracle:Soulbond (You may pair this creature with another unpaired creature when either enters the battlefield. They remain paired for as long as you control both of them.)\nAs long as Diregraf Escort is paired with another creature, both creatures have protection from Zombies.
\ No newline at end of file
diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java
index f2f36d968a7..15cc2b907da 100644
--- a/src/main/java/forge/Card.java
+++ b/src/main/java/forge/Card.java
@@ -8005,6 +8005,15 @@ public class Card extends GameEntity implements Comparable<Card> {
                     }
                 } else if (kw.equals("Protection from everything")) {
                     return true;
+                } else if (kw.startsWith("Protection:")) { // uses isValid
+                    final String characteristic = kw.split(":")[1];
+                    final String[] characteristics = characteristic.split(",");
+                    if (source.isValid(characteristics, this.getController(), this)
+                      && !source.getName().contains("Flickering Ward") && !source.getName().contains("Pentarch Ward")
+                      && !source.getName().contains("Cho-Manno's Blessing") && !source.getName().contains("Floating Shield")
+                      && !source.getName().contains("Ward of Lights")) {
+                        return true;
+                    }
                 }
 
                 if (kw.equals("Protection from colored spells")
@@ -8030,17 +8039,6 @@ public class Card extends GameEntity implements Comparable<Card> {
                     return true;
                 }
 
-                if (kw.startsWith("Protection:")) { // uses isValid
-                    final String characteristic = kw.split(":")[1];
-                    final String[] characteristics = characteristic.split(",");
-                    if (source.isValid(characteristics, this.getController(), this)
-                      && !source.getName().contains("Flickering Ward") && !source.getName().contains("Pentarch Ward")
-                      && !source.getName().contains("Cho-Manno's Blessing") && !source.getName().contains("Floating Shield")
-                      && !source.getName().contains("Ward of Lights")) {
-                        return true;
-                    }
-                }
-
             }
         }
         return false;