diff --git a/src/main/java/cl/cromer/azaraka/Cell.java b/src/main/java/cl/cromer/azaraka/Cell.java
index 2b80dc0..7e5a113 100644
--- a/src/main/java/cl/cromer/azaraka/Cell.java
+++ b/src/main/java/cl/cromer/azaraka/Cell.java
@@ -94,6 +94,15 @@ public class Cell extends JComponent implements Constants {
 		this.object = object;
 	}
 
+	/**
+	 * Get a top object
+	 *
+	 * @return Returns the top object
+	 */
+	public Object getObjectOnTop() {
+		return objectOnTop;
+	}
+
 	/**
 	 * Set a top object
 	 *
diff --git a/src/main/java/cl/cromer/azaraka/object/Player.java b/src/main/java/cl/cromer/azaraka/object/Player.java
index 411ba27..8e32993 100644
--- a/src/main/java/cl/cromer/azaraka/object/Player.java
+++ b/src/main/java/cl/cromer/azaraka/object/Player.java
@@ -490,7 +490,8 @@ public class Player extends Object implements Constants {
 	public ArrayList<Gem> getInventoryGems() {
 		ArrayList<Gem> gems = new ArrayList<>();
 		for (Object object : carrying) {
-			if (object instanceof Gem) {
+			if (object instanceof Gem && object.getCell().getObjectOnTop() == null) {
+				// Only count the gem as in inventory once it stops showing
 				gems.add((Gem) object);
 			}
 		}