diff --git a/.editorconfig b/.editorconfig
index e6a12b2..0efa990 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,6 +6,8 @@ root = true
 # Unix-style newlines with a newline ending every file
 [*]
 end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
 insert_final_newline = true
 
 # Matches multiple files with brace expansion notation
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
new file mode 100644
index 0000000..67e9384
--- /dev/null
+++ b/.github/workflows/format.yml
@@ -0,0 +1,25 @@
+name: "Check EditorConfig Format"
+on:
+  push:
+    branches:
+      - "*"
+  pull_request:
+    branches:
+      - "*"
+jobs:
+  lint:
+    runs-on: "ubuntu-22.04"
+    steps:
+      - name: "Get Changed Files"
+        id: "files"
+        uses: "masesgroup/retrieve-changed-files@v2"
+        with:
+          format: "json"
+      - name: Check out code.
+        uses: actions/checkout@v2
+      - name: "Check EditorConfig Lint"
+        run: |
+          sudo apt install -y jq golang
+          go install 'github.com/editorconfig-checker/editorconfig-checker/cmd/editorconfig-checker@latest'
+          readarray -t changed_files <<<"$(jq -r '.[]' <<<'${{ steps.files.outputs.added_modified }}')"
+          ~/go/bin/editorconfig-checker ${changed_files[@]}