diff --git a/src/renderer/initializers/command-registry.tsx b/src/renderer/initializers/command-registry.tsx
index 90f8ab2f0e..501d6bb394 100644
--- a/src/renderer/initializers/command-registry.tsx
+++ b/src/renderer/initializers/command-registry.tsx
@@ -164,12 +164,14 @@ export function initCommandRegistry() {
             entityId: getActiveClusterEntity()?.id,
           }
         })),
+        isActive: (context) => !!context.entity
       },
       {
         id: "cluster.openTerminal",
         title: "Cluster: Open terminal",
         scope: "entity",
         action: () => createTerminalTab(),
+        isActive: (context) => !!context.entity
       },
       {
         id: "hotbar.switchHotbar",