diff --git a/client/keys/utils.go b/client/keys/utils.go
index ebebf5d263..d1b3d3f657 100644
--- a/client/keys/utils.go
+++ b/client/keys/utils.go
@@ -32,8 +32,8 @@ type KeyOutput struct {
 // GetKeyBase initializes a keybase based on the configuration
 func GetKeyBase() (keys.Keybase, error) {
 	if keybase == nil {
-		rootDir := filepath.Join(viper.GetString(cli.HomeFlag), ".tlc")
-		db, err := dbm.NewGoLevelDB(KeyDBName, filepath.Join(rootDir, "data"))
+		rootDir := viper.GetString(cli.HomeFlag)
+		db, err := dbm.NewGoLevelDB(KeyDBName, filepath.Join(rootDir, "keys"))
 		if err != nil {
 			return nil, err
 		}