diff --git a/cmd/vaults/keys/keys.go b/cmd/vaults/keys/keys.go
index 67afbfd..81d8861 100644
--- a/cmd/vaults/keys/keys.go
+++ b/cmd/vaults/keys/keys.go
@@ -1,27 +1,17 @@
 package keys
 
 import (
-	"os"
-
+	"github.com/provideplatform/provide-cli/cmd/common"
 	"github.com/spf13/cobra"
 )
 
 var KeysCmd = &cobra.Command{
 	Use:   "keys",
 	Short: "Manage keys",
-	Long: `Create and manage cryptographic keys.
-
-Supports symmetric and asymmetric key specs with encrypt/decrypt and sign/verify operations.
-
-Docs: https://docs.provide.services/vault/api-reference/keys`,
+	Long:  `Create and manage cryptographic keys. Supports symmetric and asymmetric key specs with encrypt/decrypt and sign/verify operations.`,
 	Run: func(cmd *cobra.Command, args []string) {
+		common.CmdExistsOrExit(cmd, args)
 		generalPrompt(cmd, args, "")
-
-		defer func() {
-			if r := recover(); r != nil {
-				os.Exit(1)
-			}
-		}()
 	},
 }
 
diff --git a/cmd/vaults/vaults.go b/cmd/vaults/vaults.go
index 61b83bc..81d90e7 100644
--- a/cmd/vaults/vaults.go
+++ b/cmd/vaults/vaults.go
@@ -33,7 +33,6 @@ Docs: https://docs.provide.services/vault`,
 func init() {
 	VaultsCmd.AddCommand(vaultsListCmd)
 	VaultsCmd.AddCommand(vaultsInitCmd)
-
 	VaultsCmd.AddCommand(keys.KeysCmd)
 	VaultsCmd.Flags().BoolVarP(&optional, "optional", "", false, "List all the optional flags")
 	VaultsCmd.Flags().BoolVarP(&paginate, "paginate", "", false, "List pagination flags")
diff --git a/cmd/vaults/vaults_prompt.go b/cmd/vaults/vaults_prompt.go
index 2b0a8d8..5b4eac8 100644
--- a/cmd/vaults/vaults_prompt.go
+++ b/cmd/vaults/vaults_prompt.go
@@ -4,13 +4,15 @@ import (
 	"fmt"
 
 	"github.com/provideplatform/provide-cli/cmd/common"
+	"github.com/provideplatform/provide-cli/cmd/vaults/keys"
 	"github.com/spf13/cobra"
 )
 
 const promptStepInit = "Initialize"
 const promptStepList = "List"
+const promptKeys = "Keys"
 
-var emptyPromptArgs = []string{promptStepInit, promptStepList}
+var emptyPromptArgs = []string{promptStepInit, promptStepList, promptKeys}
 var emptyPromptLabel = "What would you like to do"
 
 // General Endpoints
@@ -45,6 +47,8 @@ func generalPrompt(cmd *cobra.Command, args []string, currentStep string) {
 		}
 		page, rpp = common.PromptPagination(paginate, page, rpp)
 		listVaultsRun(cmd, args)
+	case promptKeys:
+		keys.KeysCmd.Run(cmd, args)
 	case "":
 		result := common.SelectInput(emptyPromptArgs, emptyPromptLabel)
 		generalPrompt(cmd, args, result)