diff --git a/src/main/java/us/tastybento/bskyblock/api/panels/PanelItem.java b/src/main/java/us/tastybento/bskyblock/api/panels/PanelItem.java
index 534eee751..8141d7ab9 100644
--- a/src/main/java/us/tastybento/bskyblock/api/panels/PanelItem.java
+++ b/src/main/java/us/tastybento/bskyblock/api/panels/PanelItem.java
@@ -88,7 +88,7 @@ public class PanelItem {
          * This is executed when the icon is clicked
          * @param user
          * @param click
-         * @return false if the event should be cancelled
+         * @return true if the click event should be cancelled
          */
         boolean onClick(User user, ClickType click);
     }
diff --git a/src/main/java/us/tastybento/bskyblock/listeners/PanelListenerManager.java b/src/main/java/us/tastybento/bskyblock/listeners/PanelListenerManager.java
index 3eee921da..d77a4f8f2 100644
--- a/src/main/java/us/tastybento/bskyblock/listeners/PanelListenerManager.java
+++ b/src/main/java/us/tastybento/bskyblock/listeners/PanelListenerManager.java
@@ -39,13 +39,11 @@ public class PanelListenerManager implements Listener {
                         // Check that they left clicked on it
                         // TODO: in the future, we may want to support right clicking
                         if (panel.getItems().get(slot).getClickHandler().isPresent()) {
-                            if(!panel.getItems().get(slot).getClickHandler().get().onClick(user, ClickType.LEFT)) {
-                                event.setCancelled(true);
-                            } else {
-                                // If there is a listener, then run it.
-                                if (panel.getListener().isPresent()) {
-                                    panel.getListener().get().onInventoryClick(user, inventory, event.getCurrentItem());
-                                }
+                            // Cancel the event if true was returned by the ClickHandler
+                            event.setCancelled(panel.getItems().get(slot).getClickHandler().get().onClick(user, ClickType.LEFT));
+                            // If there is a listener, then run it.
+                            if (panel.getListener().isPresent()) {
+                                panel.getListener().get().onInventoryClick(user, inventory, event.getCurrentItem());
                             }
                         }
                     }