diff --git a/internal/command/workspace_command.go b/internal/command/workspace_command.go
index ff2716880f..7d1d8b24a0 100644
--- a/internal/command/workspace_command.go
+++ b/internal/command/workspace_command.go
@@ -15,6 +15,12 @@ type WorkspaceCommand struct {
 }
 
 func (c *WorkspaceCommand) Run(args []string) int {
+	c.Meta.process(args)
+	envCommandShowWarning(c.Ui, c.LegacyName)
+
+	cmdFlags := c.Meta.extendedFlagSet("workspace")
+	cmdFlags.Usage = func() { c.Ui.Error(c.Help()) }
+
 	return cli.RunResultHelp
 }