diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java
index 02b82ccb5..09211b1ea 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java
@@ -35,6 +35,7 @@ import com.shatteredpixel.shatteredpixeldungeon.windows.WndTradeItem;
 public class Shopkeeper extends NPC {
 
 	public static final String TXT_THIEF = "Thief, Thief!";
+	private int startPos = -1;
 
 	{
 		name = "shopkeeper";
@@ -43,6 +44,13 @@ public class Shopkeeper extends NPC {
 	
 	@Override
 	protected boolean act() {
+
+		if (startPos == -1) startPos = pos;
+
+		if (startPos != pos){
+			flee();
+			return true;
+		}
 		
 		throwItem();