diff --git a/errors/errors.go b/errors/errors.go
index 5d54bedfc9..0dedd42688 100644
--- a/errors/errors.go
+++ b/errors/errors.go
@@ -244,6 +244,26 @@ func (e *wrappedError) Unwrap() error {
 	return e.parent
 }
 
+// GRPCStatus gets the gRPC status from the wrapped error or returns an unknown gRPC status.
+func (e *wrappedError) GRPCStatus() *grpcstatus.Status {
+	w := e.Cause()
+	for {
+		if hasStatus, ok := w.(interface {
+			GRPCStatus() *grpcstatus.Status
+		}); ok {
+			return hasStatus.GRPCStatus()
+		}
+
+		x, ok := w.(causer)
+		if ok {
+			w = x.Cause()
+		}
+		if x == nil {
+			return grpcstatus.New(grpccodes.Unknown, e.msg)
+		}
+	}
+}
+
 // Recover captures a panic and stop its propagation. If panic happens it is
 // transformed into a ErrPanic instance and assigned to given error. Call this
 // function using defer in order to work as expected.
diff --git a/errors/errors_test.go b/errors/errors_test.go
index 07868eb76f..acc00fb129 100644
--- a/errors/errors_test.go
+++ b/errors/errors_test.go
@@ -213,11 +213,14 @@ func (s *errorsTestSuite) TestABCIError() {
 func (s *errorsTestSuite) TestGRPCStatus() {
 	s.Require().Equal(codes.Unknown, grpcstatus.Code(errInternal))
 	s.Require().Equal(codes.NotFound, grpcstatus.Code(ErrNotFound))
-	s.Require().Equal(codes.Unimplemented, grpcstatus.Code(ErrNotSupported))
-	s.Require().Equal(codes.FailedPrecondition, grpcstatus.Code(ErrConflict))
+
 	status, ok := grpcstatus.FromError(ErrNotFound)
 	s.Require().True(ok)
 	s.Require().Equal("codespace testtesttest code 38: not found", status.Message())
+
+	// test wrapping
+	s.Require().Equal(codes.Unimplemented, grpcstatus.Code(ErrNotSupported.Wrap("test")))
+	s.Require().Equal(codes.FailedPrecondition, grpcstatus.Code(ErrConflict.Wrapf("test %s", "foo")))
 }
 
 func ExampleWrap() {