diff --git a/src/main/java/world/bentobox/bskyblock/commands/IslandCommand.java b/src/main/java/world/bentobox/bskyblock/commands/IslandCommand.java
index 1a08269..4d176b2 100644
--- a/src/main/java/world/bentobox/bskyblock/commands/IslandCommand.java
+++ b/src/main/java/world/bentobox/bskyblock/commands/IslandCommand.java
@@ -73,6 +73,9 @@ public class IslandCommand extends CompositeCommand {
         if (args.isEmpty()) {
             // If user has an island, go
             if (getPlugin().getIslands().getIsland(getWorld(), user.getUniqueId()) != null) {
+                if (getSubCommand("controlpanel").isPresent()) {
+                    return getSubCommand("controlpanel").get().call(user, label, new ArrayList<>());
+                }
                 return getSubCommand("go").map(goCmd -> goCmd.call(user, goCmd.getLabel(), new ArrayList<>())).orElse(false);
             }
             // No islands currently