diff --git a/layers/+lang/yaml/packages.el b/layers/+lang/yaml/packages.el
index b3576dad8..bbf3ce3cc 100644
--- a/layers/+lang/yaml/packages.el
+++ b/layers/+lang/yaml/packages.el
@@ -9,7 +9,11 @@
 ;; This file is not part of GNU Emacs.
 ;;
 ;;; License: GPLv3
-(setq yaml-packages '(yaml-mode))
+(setq yaml-packages '(company
+                      yaml-mode))
+
+(defun yaml/post-init-company ()
+  (add-hook 'yaml-mode-hook 'company-mode))
 
 (defun yaml/init-yaml-mode ()
   "Initialize YAML mode"