diff --git a/.editorconfig b/.editorconfig
index c16bbae..18ee357 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,6 +6,7 @@ indent_size = 2
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+switch_case_indent = true
 
 [Makefile]
 indent_style = tab
diff --git a/Makefile b/Makefile
index 8047282..0a199e7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 SH_SRCFILES = $(shell git ls-files "bin/*" "*.bash")
-SHFMT_BASE_FLAGS = -s -i 2 -ci
+SHFMT_BASE_FLAGS = -s
 
 fmt:
 	shfmt -w $(SHFMT_BASE_FLAGS) $(SH_SRCFILES)