diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0fdf786471..865fc53af2 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -17,5 +17,11 @@
     "shellscript"
   ],
   "shellformat.path": "${workspaceFolder}/Library/Homebrew/utils/shfmt.sh",
-  "shellformat.flag": "-i 2 -ci -ln bash"
+  "shellformat.flag": "-i 2 -ci -ln bash",
+  "[shellscript]": {
+    "editor.formatOnSave": true,
+    "editor.codeActionsOnSave": {
+      "source.fixAll.shellcheck": true,
+    }
+  }
 }