diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/CellSelector.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/CellSelector.java
index bcf31775f..8b228a776 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/CellSelector.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/CellSelector.java
@@ -89,7 +89,9 @@ public class CellSelector extends TouchArea {
 			startZoom = camera.zoom;
 
 			dragging = false;
-		}
+		} else if (t != touch) {
+            reset();
+        }
 	}
 	
 	@Override
@@ -150,7 +152,27 @@ public class CellSelector extends TouchArea {
 		
 		GameScene.ready();
 	}
-	
+
+    @Override
+    public void reset() {
+        super.reset();
+        another = null;
+        if (pinching){
+            pinching = false;
+
+            int zoom = Math.round( camera.zoom );
+            camera.zoom( zoom );
+            ShatteredPixelDungeon.zoom((int) (zoom - PixelScene.defaultZoom));
+        }
+    }
+
+    public void enable(boolean value){
+        if (enabled != value){
+            enabled = value;
+            reset();
+        }
+    }
+
 	public interface Listener {
 		void onSelect( Integer cell );
 		String prompt();
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
index e49f95c28..7d3be072a 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
@@ -379,8 +379,8 @@ public class GameScene extends PixelScene {
 
 			layoutTags();
 		}
-		
-		cellSelector.enabled = Dungeon.hero.ready;
+
+        cellSelector.enable(Dungeon.hero.ready);
 	}
 
 	private boolean tagAttack    = false;