diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfWarding.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfWarding.java
index 77fccb927..211398d7d 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfWarding.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfWarding.java
@@ -76,7 +76,6 @@ public class WandOfWarding extends Wand {
 				GameScene.add(ward, 1f);
 				Dungeon.level.press(ward.pos, ward);
 				ward.sprite.emitter().burst(MagicMissile.WardParticle.UP, ward.tier);
-				QuickSlotButton.target(ward);
 			} else {
 				GLog.w( Messages.get(this, "no_more_wards"));
 			}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java
index 237fc758f..503d2fbca 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java
@@ -227,7 +227,7 @@ public class QuickSlotButton extends Button implements WndBag.Listener {
 	}
 	
 	public static void target( Char target ) {
-		if (target != Dungeon.hero) {
+		if (target != null && target.alignment != Char.Alignment.ALLY) {
 			lastTarget = target;
 			
 			TargetHealthIndicator.instance.target( target );