diff --git a/PENDING.md b/PENDING.md
index e07319d49e..10b0f93bb7 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -49,6 +49,7 @@ BREAKING CHANGES
     * [store] Change storeInfo within the root multistore to use tmhash instead of ripemd160 \#2308
     * [codec] \#2324 All referrences to wire have been renamed to codec. Additionally, wire.NewCodec is now codec.New().
     * [types] \#2343 Make sdk.Msg have a names field, to facilitate automatic tagging.
+    * [baseapp] \#2366 Automatically add action tags to all messages
 
 * Tendermint
 
diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go
index 63d7b17e8d..cbf81d87d3 100644
--- a/baseapp/baseapp.go
+++ b/baseapp/baseapp.go
@@ -539,6 +539,7 @@ func (app *BaseApp) runMsgs(ctx sdk.Context, msgs []sdk.Msg, mode runTxMode) (re
 		if mode != runTxModeCheck {
 			msgResult = handler(ctx, msg)
 		}
+		msgResult.Tags = append(msgResult.Tags, sdk.MakeTag("action", []byte(msg.Name())))
 
 		// NOTE: GasWanted is determined by ante handler and
 		// GasUsed by the GasMeter