diff --git a/.idea/misc.xml b/.idea/misc.xml
index d9b60d3..8569d1d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
+    <list size="3">
+      <item index="0" class="java.lang.String" itemvalue="cz.jzitnik.annotations.EventHandler" />
+      <item index="1" class="java.lang.String" itemvalue="cz.jzitnik.annotations.ui.KeyboardPressHandler" />
+      <item index="2" class="java.lang.String" itemvalue="cz.jzitnik.annotations.ui.MouseHandler" />
+    </list>
     <writeAnnotations>
       <writeAnnotation name="cz.jzitnik.annotations.injectors.InjectConfig" />
       <writeAnnotation name="cz.jzitnik.annotations.injectors.InjectDependency" />
diff --git a/src/main/java/cz/jzitnik/events/handlers/KeyboardPressEventHandler.java b/src/main/java/cz/jzitnik/events/handlers/KeyboardPressEventHandler.java
index 0292457..645bb17 100644
--- a/src/main/java/cz/jzitnik/events/handlers/KeyboardPressEventHandler.java
+++ b/src/main/java/cz/jzitnik/events/handlers/KeyboardPressEventHandler.java
@@ -8,7 +8,6 @@ import cz.jzitnik.game.GameState;
 import cz.jzitnik.utils.DependencyManager;
 import cz.jzitnik.utils.GlobalIOHandlerRepository;
 import cz.jzitnik.utils.events.AbstractEventHandler;
-import cz.jzitnik.utils.events.EventManager;
 
 @EventHandler(KeyboardPressEvent.class)
 public class KeyboardPressEventHandler extends AbstractEventHandler<KeyboardPressEvent> {
@@ -16,9 +15,6 @@ public class KeyboardPressEventHandler extends AbstractEventHandler<KeyboardPres
         super(dm);
     }
 
-    @InjectDependency
-    private EventManager eventManager;
-
     @InjectState
     private GameState gameState;
 
diff --git a/src/main/java/cz/jzitnik/game/setup/rooms/MainRoom.java b/src/main/java/cz/jzitnik/game/setup/rooms/MainRoom.java
index d5a7613..db0ca8e 100644
--- a/src/main/java/cz/jzitnik/game/setup/rooms/MainRoom.java
+++ b/src/main/java/cz/jzitnik/game/setup/rooms/MainRoom.java
@@ -28,6 +28,6 @@ public class MainRoom extends GameRoom {
         addObject(chest);
 
         Zombie zombie = new Zombie(resourceManager, new RoomCords(100, 100));
-        addMob(zombie);
+        //addMob(zombie);
     }
 }
diff --git a/src/main/java/cz/jzitnik/ui/Inventory.java b/src/main/java/cz/jzitnik/ui/Inventory.java
index 2d7026f..cdb9566 100644
--- a/src/main/java/cz/jzitnik/ui/Inventory.java
+++ b/src/main/java/cz/jzitnik/ui/Inventory.java
@@ -6,11 +6,9 @@ import com.googlecode.lanterna.TextColor;
 import cz.jzitnik.annotations.Dependency;
 import cz.jzitnik.annotations.injectors.InjectDependency;
 import cz.jzitnik.annotations.injectors.InjectState;
-import cz.jzitnik.annotations.ui.MouseHandler;
-import cz.jzitnik.annotations.ui.MouseHandlerType;
-import cz.jzitnik.annotations.ui.Render;
-import cz.jzitnik.annotations.ui.UI;
+import cz.jzitnik.annotations.ui.*;
 import cz.jzitnik.events.InventoryRerender;
+import cz.jzitnik.events.KeyboardPressEvent;
 import cz.jzitnik.events.MouseAction;
 import cz.jzitnik.game.GameState;
 import cz.jzitnik.game.ResourceManager;
@@ -108,6 +106,19 @@ public class Inventory {
         offsetX = (maxX / 2) - (INVENTORY_WIDTH / 2);
     }
 
+    @KeyboardPressHandler(character = 'q')
+    @KeyboardPressHandler(character = 'Q')
+    public boolean handleItemDrop(KeyboardPressEvent ignored) {
+        if (inventoryState.selectedItem == -1) {
+            return false;
+        }
+
+        log.debug("Dropping item!");
+        // TODO: Dropping items on a ground
+
+        return true;
+    }
+
     @MouseHandler(MouseHandlerType.CLICK)
     public boolean handleClick(MouseAction mouseAction) {
         inventoryState.onNextDragTakeItemOnIndex = -1;
@@ -149,6 +160,10 @@ public class Inventory {
             inventoryState.isGonnaDoubleClick = false;
             inventoryState.selectedItem = -1;
 
+            if (inventory[itemClickedOnIndex] == null) {
+                return true;
+            }
+
             if (inventory[itemClickedOnIndex].getType() instanceof InteractableItem item) {
                 switch (item.interact(dependencyManager, stateManager)) {
                     case CLEAR_ITEM -> {
diff --git a/src/main/java/cz/jzitnik/ui/utils/Grid.java b/src/main/java/cz/jzitnik/ui/utils/Grid.java
index 7fbbf00..5d5c3ae 100644
--- a/src/main/java/cz/jzitnik/ui/utils/Grid.java
+++ b/src/main/java/cz/jzitnik/ui/utils/Grid.java
@@ -131,16 +131,16 @@ public class Grid {
         return buffer;
     }
 
-    public int getItemIndexAt(int x, int y) {
-        return getItemIndexAt(x, y, false);
-    }
-
     /**
      * Calculates which item index corresponds to the given x/y coordinates relative to the Grid's top-left.
      * @param x X coordinate relative to the Grid (0 is left edge of the outer border)
      * @param y Y coordinate relative to the Grid (0 is top edge of the outer border)
      * @return The index of the item, or -1 if the click was on a border/background/out of bounds.
      */
+    public int getItemIndexAt(int x, int y) {
+        return getItemIndexAt(x, y, false);
+    }
+
     public int getItemIndexAt(int x, int y, boolean ignoreInnerBorder) {
         if (x < 0 || x >= gridWidth || y < 0 || y >= gridHeight) {
             return -1;
diff --git a/src/main/java/cz/jzitnik/utils/StateManager.java b/src/main/java/cz/jzitnik/utils/StateManager.java
index 72aa72b..51837a9 100644
--- a/src/main/java/cz/jzitnik/utils/StateManager.java
+++ b/src/main/java/cz/jzitnik/utils/StateManager.java
@@ -3,7 +3,6 @@ package cz.jzitnik.utils;
 
 import cz.jzitnik.annotations.Dependency;
 import cz.jzitnik.annotations.State;
-import cz.jzitnik.annotations.injectors.InjectDependency;
 import lombok.extern.slf4j.Slf4j;
 import org.reflections.Reflections;