diff --git a/lisp/ti-config/work-config.el b/lisp/ti-config/work-config.el
index 802ab8e..4c0bde8 100644
--- a/lisp/ti-config/work-config.el
+++ b/lisp/ti-config/work-config.el
@@ -37,6 +37,14 @@
 (require 'bisect-mode)
 (require 'deadgrep-rejump-mode)
 
+(use-package editorconfig
+  :config
+  (editorconfig-mode 1)
+
+  (advice-add #'editorconfig-set-trailing-ws
+              :override
+              #'ignore))
+
 (put 'magit-log-mode 'magit-log-default-arguments
      '("--graph" "-n64" "--decorate"))