diff --git a/.vscode/settings.json b/.vscode/settings.json
index 44bef96287..5aa6512cdc 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -25,6 +25,7 @@
         "typescript"
     ],
     "files.eol": "\n",
+    "files.trimTrailingWhitespace": true,
     "html-validate.validate": [
         "html"
     ]
diff --git a/ext/data/templates/anki-field-templates-upgrade-v24.handlebars b/ext/data/templates/anki-field-templates-upgrade-v24.handlebars
index 2288737cc2..cd85028af7 100644
--- a/ext/data/templates/anki-field-templates-upgrade-v24.handlebars
+++ b/ext/data/templates/anki-field-templates-upgrade-v24.handlebars
@@ -4,7 +4,7 @@
             {{~#each definition.phoneticTranscriptions~}}
                 {{~#each phoneticTranscriptions~}}
                     <li>
-                        {{~set "any" false~}}   
+                        {{~set "any" false~}}
                         {{~#each tags~}}
                             {{~#if (get "any")}}, {{else}}<i>({{/if~}}
                             {{name}}
diff --git a/ext/data/templates/default-anki-field-templates.handlebars b/ext/data/templates/default-anki-field-templates.handlebars
index 07efd07e1a..63613acf34 100644
--- a/ext/data/templates/default-anki-field-templates.handlebars
+++ b/ext/data/templates/default-anki-field-templates.handlebars
@@ -239,7 +239,7 @@
             {{~#each definition.phoneticTranscriptions~}}
                 {{~#each phoneticTranscriptions~}}
                     <li>
-                        {{~set "any" false~}}   
+                        {{~set "any" false~}}
                         {{~#each tags~}}
                             {{~#if (get "any")}}, {{else}}<i>({{/if~}}
                             {{name}}
diff --git a/test/data/html/document-util.html b/test/data/html/document-util.html
index 8e007392ec..7ece0a6d32 100644
--- a/test/data/html/document-util.html
+++ b/test/data/html/document-util.html
@@ -271,7 +271,7 @@ <h1>DocumentUtil Tests</h1>
                 "        わゐ　ゑを",
                 "        "
             ]
-        }'  
+        }'
     >
         <span>
         あいうえお
@@ -353,7 +353,7 @@ <h1>DocumentUtil Tests</h1>
                 "        わゐ　ゑを",
                 "        t"
             ]
-        }'  
+        }'
     >
         <span>
         あいうえお
@@ -394,7 +394,7 @@ <h1>DocumentUtil Tests</h1>
                 "        わゐ　ゑを",
                 "        t"
             ]
-        }'  
+        }'
     >
         <span>
         あいうえお