diff --git a/modules/prelude-yaml.el b/modules/prelude-yaml.el
index d864c62..8dd7e4a 100644
--- a/modules/prelude-yaml.el
+++ b/modules/prelude-yaml.el
@@ -36,6 +36,7 @@
 ;; yaml-mode doesn't derive from prog-mode, but we can at least enable
 ;; whitespace-mode and apply cleanup.
 (add-hook 'yaml-mode-hook 'whitespace-mode)
+(add-hook 'yaml-mode-hook 'subword-mode)
 (add-hook 'yaml-mode-hook
           (lambda () (add-hook 'before-save-hook 'prelude-cleanup-maybe nil t)))