diff --git a/Assets/Scripts/Inventory.cs b/Assets/Scripts/Inventory.cs
index aaddda4..98b18f2 100644
--- a/Assets/Scripts/Inventory.cs
+++ b/Assets/Scripts/Inventory.cs
@@ -35,6 +35,15 @@ public class Inventory : ItemStorage {
         base.AddItem(item, amount);
     }
 
+    public override void RemoveItem(Item item, int amount)
+    {
+        base.RemoveItem(item, amount);
+        if (!items.ContainsKey(item))
+        {
+            PlayerController.instance.DeselectItem();
+        }
+    }
+
     public void SellItem(Item item, int amount) {
         PlayerController.instance.ChangeMoney(item.SellPrice);
         Shop.instance.AddItem(item, amount);
diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs
index 8d92a72..48a8ab7 100644
--- a/Assets/Scripts/PlayerController.cs
+++ b/Assets/Scripts/PlayerController.cs
@@ -51,6 +51,12 @@ public class PlayerController : MonoBehaviour {
         }
     }
 
+    public void DeselectItem()
+    {
+        _selectedItem = null;
+        Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
+    }
+
     public UsableItem GetSelectedItem() {
         return _selectedItem;
     }
diff --git a/Assets/Scripts/Tiles/FarmlandTile.cs b/Assets/Scripts/Tiles/FarmlandTile.cs
index 29c8e9e..7bfa84e 100644
--- a/Assets/Scripts/Tiles/FarmlandTile.cs
+++ b/Assets/Scripts/Tiles/FarmlandTile.cs
@@ -20,14 +20,17 @@ namespace Tiles
         public override BaseTile Clicked(UsableItem usable)
         {
             BaseTile rv = null;
-            base.Clicked(usable);
-            _crop.Clicked(usable);
-
-            if (ItemContainer.Instance.GetItemIdByName("Shovel") == usable.Id)
+            if (usable != null)
             {
-                rv = new GrassTile(_gameObject);
+                base.Clicked(usable);
+                _crop.Clicked(usable);
+
+                if (ItemContainer.Instance.GetItemIdByName("Shovel") == usable.Id)
+                {
+                    rv = new GrassTile(_gameObject);
+                }
             }
-            
+
             return rv;
         }
     }