diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionGate.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionGate.java
index 5c0b3422..f7ceb0e3 100644
--- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionGate.java
+++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionGate.java
@@ -3,6 +3,7 @@ package com.eu.habbo.habbohotel.items.interactions;
 import com.eu.habbo.habbohotel.gameclients.GameClient;
 import com.eu.habbo.habbohotel.items.Item;
 import com.eu.habbo.habbohotel.rooms.Room;
+import com.eu.habbo.habbohotel.rooms.RoomTile;
 import com.eu.habbo.habbohotel.rooms.RoomUnit;
 import com.eu.habbo.habbohotel.users.HabboItem;
 import com.eu.habbo.habbohotel.wired.WiredEffectType;
@@ -38,17 +39,21 @@ public class InteractionGate extends HabboItem {
 
     @Override
     public void onClick(GameClient client, Room room, Object[] objects) throws Exception {
-        boolean isWired = (objects.length >= 2 && objects[1] instanceof WiredEffectType && objects[1] == WiredEffectType.TOGGLE_STATE);
-        if (client != null && !room.hasRights(client.getHabbo()) && !isWired)
+        boolean executedByWired = (objects.length >= 2 && objects[1] instanceof WiredEffectType && objects[1] == WiredEffectType.TOGGLE_STATE);
+
+        if (client != null && !room.hasRights(client.getHabbo()) && !executedByWired)
             return;
 
-        if (!isWired && !room.getHabbosAt(this.getX(), this.getY()).isEmpty())
-            return;
+        // If a Habbo is standing on a tile occupied by the gate, the gate shouldn't open/close
+        for (RoomTile tile : room.getLayout().getTilesAt(room.getLayout().getTile(this.getX(), this.getY()), this.getBaseItem().getWidth(), this.getBaseItem().getLength(), this.getRotation()))
+            if (room.hasHabbosAt(tile.x, tile.y))
+                return;
 
+        // Gate closed = 0, open = 1
         if (this.getExtradata().length() == 0)
             this.setExtradata("0");
 
-        this.setExtradata((Integer.valueOf(this.getExtradata()) + 1) % 2 + "");
+        this.setExtradata((Integer.parseInt(this.getExtradata()) + 1) % 2 + "");
         room.updateTile(room.getLayout().getTile(this.getX(), this.getY()));
         this.needsUpdate(true);
         room.updateItemState(this);