diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2eea826b..900b4660 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -643,12 +643,6 @@ jobs:
       - run:
           name: Lint
           command: yarn lint
-      - run:
-          name: Format text
-          command: yarn format-text
-      - run:
-          name: Format shell scripts
-          command: yarn format-shell
   faucet-docker:
     docker:
       - image: cimg/go:1.17.8
diff --git a/.github/workflows/autofix.yml b/.github/workflows/autofix.yml
new file mode 100644
index 00000000..2b50f97c
--- /dev/null
+++ b/.github/workflows/autofix.yml
@@ -0,0 +1,41 @@
+name: autofix.ci # needed to securely identify the workflow
+
+on:
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  # format-text and format-shell in one job to ensure we don't require multiple fix commits and CI re-runs
+  format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          lfs: true
+
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+          cache: 'yarn'
+
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "oldstable"
+
+      - name: Install shfmt
+        run: go install mvdan.cc/sh/v3/cmd/shfmt@v3.11.0
+
+      - name: Install dependencies
+        run: yarn install --immutable --immutable-cache --check-cache
+
+      - name: Format text
+        run: yarn format-text
+
+      - name: Format shell
+        run: yarn format-shell
+
+      # See https://autofix.ci/
+      - uses: autofix-ci/action@v1
diff --git a/README.md b/README.md
index 7702371c..8671239f 100644
--- a/README.md
+++ b/README.md
@@ -199,8 +199,8 @@ and suggestions.
 - [GitHub issues](https://github.com/cosmos/cosmjs/issues) for bugs and feature
   requests
 - The `#dev-chat` channel, or `#dev-support-ai` on the
-  [interchain Discord server](https://discord.gg/interchain) for
-  questions and open discussions
+  [interchain Discord server](https://discord.gg/interchain) for questions and
+  open discussions
 - [#CosmJS on Twitter](https://twitter.com/search?q=%23CosmJS) to spread the
   word