diff --git a/nms-patches/PlayerConnection.patch b/nms-patches/PlayerConnection.patch
index 2b0731abcc..251a1982dd 100644
--- a/nms-patches/PlayerConnection.patch
+++ b/nms-patches/PlayerConnection.patch
@@ -1129,8 +1129,9 @@
          PlayerConnectionUtils.ensureMainThread(packetplayinwindowclick, this, this.player.x());
 +        if (this.player.isFrozen()) return; // CraftBukkit
          this.player.resetIdleTimer();
-         if (this.player.activeContainer.windowId == packetplayinwindowclick.a() && this.player.activeContainer.c(this.player)) {
+-        if (this.player.activeContainer.windowId == packetplayinwindowclick.a() && this.player.activeContainer.c(this.player)) {
 -            if (this.player.isSpectator()) {
++        if (this.player.activeContainer.windowId == packetplayinwindowclick.a() && this.player.activeContainer.c(this.player) && this.player.activeContainer.a(this.player)) { // CraftBukkit
 +            boolean cancelled = this.player.isSpectator(); // CraftBukkit - see below if
 +            if (false/*this.player.isSpectator()*/) { // CraftBukkit
                  NonNullList nonnulllist = NonNullList.a();