1 files changed, 4 insertions, 2 deletions
diff --git a/core/src/ch/asynk/tankontank/game/states/StateSelect.java b/core/src/ch/asynk/tankontank/game/states/StateSelect.java
index 14d0d1b..ed64a0e 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateSelect.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateSelect.java
@@ -58,7 +58,6 @@ public class StateSelect extends StateCommon
     @Override
     public void touchUp()
     {
-
         if (!isEnemy) {
             if (map.possibleMoves.contains(upHex)) {
                 // quick move
@@ -75,8 +74,10 @@ public class StateSelect extends StateCommon
         }
 
         hidePossibilities();
-        if (upHex.isOffMap())
+        if (upHex.isOffMap()) {
+            selectedUnit = null;
             return;
+        }
 
         Unit unit = upHex.getUnit();
 
@@ -84,6 +85,7 @@ public class StateSelect extends StateCommon
             isEnemy = false;
             ctrl.hud.actionButtons.hide();
             map.clearAll();
+            selectedUnit = null;
             return;
         }