diff --git a/packages/web/src/commands/stdCommands.ts b/packages/web/src/commands/stdCommands.ts
index 5c5d28d75..7b0003f38 100644
--- a/packages/web/src/commands/stdCommands.ts
+++ b/packages/web/src/commands/stdCommands.ts
@@ -112,6 +112,7 @@ registerCommand({
   name: 'Table',
   toolbar: true,
   toolbarName: 'New table',
+  testEnabled: () => !!get(currentDatabase),
   onClick: () => {
     const $currentDatabase = get(currentDatabase);
     const connection = _.get($currentDatabase, 'connection') || {};