diff --git a/cli/list.go b/cli/list.go
index c69308a2f6..11c3936278 100644
--- a/cli/list.go
+++ b/cli/list.go
@@ -15,14 +15,13 @@ import (
 )
 
 func list() *cobra.Command {
-	var (
-		columns []string
-	)
+	var columns []string
 	cmd := &cobra.Command{
 		Annotations: workspaceCommand,
 		Use:         "list",
 		Short:       "List all workspaces",
 		Aliases:     []string{"ls"},
+		Args:        cobra.ExactArgs(0),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			client, err := createClient(cmd)
 			if err != nil {
diff --git a/cli/show.go b/cli/show.go
index 2b1213adc1..145e8d6e3f 100644
--- a/cli/show.go
+++ b/cli/show.go
@@ -10,7 +10,7 @@ import (
 func show() *cobra.Command {
 	return &cobra.Command{
 		Annotations: workspaceCommand,
-		Use:         "show",
+		Use:         "show <workspace>",
 		Short:       "Show details of a workspace's resources and agents",
 		Args:        cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {