diff --git a/cli/app/secret.go b/cli/app/secret.go
index 5a1d2d51..452e03ad 100644
--- a/cli/app/secret.go
+++ b/cli/app/secret.go
@@ -27,11 +27,12 @@ var allSecretsFlag = &cli.BoolFlag{
 }
 
 var appSecretGenerateCommand = &cli.Command{
-	Name:      "generate",
-	Aliases:   []string{"g"},
-	Usage:     "Generate secrets",
-	ArgsUsage: "<secret> <version>",
-	Flags:     []cli.Flag{allSecretsFlag, internal.PassFlag},
+	Name:         "generate",
+	Aliases:      []string{"g"},
+	Usage:        "Generate secrets",
+	ArgsUsage:    "<secret> <version>",
+	Flags:        []cli.Flag{allSecretsFlag, internal.PassFlag},
+	BashComplete: autocomplete.AppNameComplete,
 	Action: func(c *cli.Context) error {
 		app := internal.ValidateApp(c)
 
@@ -95,11 +96,12 @@ var appSecretGenerateCommand = &cli.Command{
 }
 
 var appSecretInsertCommand = &cli.Command{
-	Name:      "insert",
-	Aliases:   []string{"i"},
-	Usage:     "Insert secret",
-	Flags:     []cli.Flag{internal.PassFlag},
-	ArgsUsage: "<app> <secret-name> <version> <data>",
+	Name:         "insert",
+	Aliases:      []string{"i"},
+	Usage:        "Insert secret",
+	Flags:        []cli.Flag{internal.PassFlag},
+	ArgsUsage:    "<app> <secret-name> <version> <data>",
+	BashComplete: autocomplete.AppNameComplete,
 	Description: `
 This command inserts a secret into an app environment.
 
@@ -139,11 +141,12 @@ Example:
 }
 
 var appSecretRmCommand = &cli.Command{
-	Name:      "remove",
-	Usage:     "Remove a secret",
-	Aliases:   []string{"rm"},
-	Flags:     []cli.Flag{allSecretsFlag, internal.PassFlag},
-	ArgsUsage: "<app> <secret-name>",
+	Name:         "remove",
+	Usage:        "Remove a secret",
+	Aliases:      []string{"rm"},
+	Flags:        []cli.Flag{allSecretsFlag, internal.PassFlag},
+	ArgsUsage:    "<app> <secret-name>",
+	BashComplete: autocomplete.AppNameComplete,
 	Description: `
 This command removes a secret from an app environment.