diff --git a/PENDING.md b/PENDING.md
index 33c265195..66347603a 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -6,6 +6,7 @@ BREAKING CHANGES
 
 * Gaia CLI  (`gaiacli`)
   * [cli] [\#2595](https://github.com/cosmos/cosmos-sdk/issues/2595) Remove `keys new` in favor of `keys add` incorporating existing functionality with addition of key recovery functionality.
+  * [cli] [\#2987](https://github.com/cosmos/cosmos-sdk/pull/2987) Add shorthand `-a` to `gaiacli keys show` and update docs
   * [cli] [\#2971](https://github.com/cosmos/cosmos-sdk/pull/2971) Additional verification when running `gaiad gentx`
   * [cli] [\#2734](https://github.com/cosmos/cosmos-sdk/issues/2734) Rewrite `gaiacli config`. It is now a non-interactive config utility.
 
diff --git a/client/keys/show.go b/client/keys/show.go
index 3b574544b..d539eb3b7 100644
--- a/client/keys/show.go
+++ b/client/keys/show.go
@@ -2,9 +2,10 @@ package keys
 
 import (
 	"fmt"
+	"net/http"
+
 	"github.com/cosmos/cosmos-sdk/crypto/keys"
 	"github.com/tendermint/tendermint/crypto"
-	"net/http"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys/keyerror"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -50,8 +51,8 @@ func showKeysCmd() *cobra.Command {
 	}
 
 	cmd.Flags().String(FlagBechPrefix, "acc", "The Bech32 prefix encoding for a key (acc|val|cons)")
-	cmd.Flags().Bool(FlagAddress, false, "output the address only (overrides --output)")
-	cmd.Flags().Bool(FlagPublicKey, false, "output the public key only (overrides --output)")
+	cmd.Flags().BoolP(FlagAddress, "a", false, "output the address only (overrides --output)")
+	cmd.Flags().BoolP(FlagPublicKey, "p", false, "output the public key only (overrides --output)")
 	cmd.Flags().Uint(flagMultiSigThreshold, 1, "K out of N required signatures")
 
 	return cmd
diff --git a/docs/gaia/deploy-testnet.md b/docs/gaia/deploy-testnet.md
index ba7f0ecfd..4a511c503 100644
--- a/docs/gaia/deploy-testnet.md
+++ b/docs/gaia/deploy-testnet.md
@@ -34,7 +34,7 @@ gaiacli keys add validator
 # Add that key into the genesis.app_state.accounts array in the genesis file
 # NOTE: this command lets you set the number of coins. Make sure this account has some coins
 # with the genesis.app_state.stake.params.bond_denom denom, the default is STAKE
-gaiad add-genesis-account $(gaiacli keys show validator -o json | jq -r ".address") 1000STAKE,1000validatorToken
+gaiad add-genesis-account $(gaiacli keys show validator -a) 1000STAKE,1000validatorToken
 
 # Generate the transaction that creates your validator
 gaiad gentx --name validator