diff --git a/.ci/helper_shellchecks.sh b/.ci/helper_shellchecks.sh
index bc70b1589..5679835a4 100755
--- a/.ci/helper_shellchecks.sh
+++ b/.ci/helper_shellchecks.sh
@@ -8,24 +8,24 @@ source "${CI_DIR}/common.sh"
 mapfile -t shellscript_locations < <({ git grep -lE '^#!(/usr)?/bin/(env )?(bash|sh)' | sed "/^plugins\/terminal.koplugin\/shfm$/d" && git submodule --quiet foreach '[ "$path" = "base" -o "$path" = "platform/android/luajit-launcher" ] || git grep -lE "^#!(/usr)?/bin/(env )?(bash|sh)" | sed "s|^|$path/|"' && git ls-files ./*.sh; } | sort | uniq)
 
 SHELLSCRIPT_ERROR=0
-SHFMT_OPTIONS="-i 4 -ci"
+SHFMT_OPTIONS="--indent 4 --case-indent"
 
 for shellscript in "${shellscript_locations[@]}"; do
     echo -e "${ANSI_GREEN}Running shellcheck on ${shellscript}"
     shellcheck "${shellscript}" || SHELLSCRIPT_ERROR=1
     echo -e "${ANSI_GREEN}Running shfmt on ${shellscript}"
     # shellcheck disable=2086
-    if ! shfmt ${SHFMT_OPTIONS} -kp "${shellscript}" >/dev/null 2>&1; then
+    if ! shfmt ${SHFMT_OPTIONS} --keep-padding "${shellscript}" >/dev/null 2>&1; then
         echo -e "${ANSI_RED}Warning: ${shellscript} contains the following problem:"
         # shellcheck disable=2086
-        shfmt ${SHFMT_OPTIONS} -kp "${shellscript}" || SHELLSCRIPT_ERROR=1
+        shfmt ${SHFMT_OPTIONS} --keep-padding "${shellscript}" || SHELLSCRIPT_ERROR=1
         continue
     fi
     # shellcheck disable=2086
     if [ "$(cat "${shellscript}")" != "$(shfmt ${SHFMT_OPTIONS} "${shellscript}")" ]; then
         echo -e "${ANSI_RED}Warning: ${shellscript} does not abide by coding style, diff for expected style:"
         # shellcheck disable=2086
-        shfmt ${SHFMT_OPTIONS} -d "${shellscript}" || SHELLSCRIPT_ERROR=1
+        shfmt ${SHFMT_OPTIONS} --diff "${shellscript}" || SHELLSCRIPT_ERROR=1
     fi
 done