diff --git a/conf/templates/pyproject.toml b/conf/templates/pyproject.toml
index 6b6a5d57..50c7c7bf 100644
--- a/conf/templates/pyproject.toml
+++ b/conf/templates/pyproject.toml
@@ -18,6 +18,11 @@
 [tool.isort]
 
   multi_line_output = 3
+
+  # Keep trailing commas so that yapf's split_arguments_when_comma_terminated
+  # keeps the one-per-line layout that isort produces.
+  include_trailing_comma = true
+
   line_length = 88
   lines_after_imports = 1
   lines_between_sections = 1