diff --git a/runtime/help/options.md b/runtime/help/options.md
index d3e4ef93..a65c24a4 100644
--- a/runtime/help/options.md
+++ b/runtime/help/options.md
@@ -195,7 +195,7 @@ Default plugin options:
 	default value: `on`
 
 * `ftoptions`: by default, micro will set some options based on the filetype. At the moment, micro will
-   use tabs for makefiles and spaces for python files regardless of your settings. If you would like to
+   use tabs for makefiles and spaces for python and yaml files regardless of your settings. If you would like to
    disable this behavior turn this option off.
 
 	default value: `on`
diff --git a/runtime/plugins/ftoptions/ftoptions.lua b/runtime/plugins/ftoptions/ftoptions.lua
index bc57dcdc..698fc60b 100644
--- a/runtime/plugins/ftoptions/ftoptions.lua
+++ b/runtime/plugins/ftoptions/ftoptions.lua
@@ -11,7 +11,7 @@ function onViewOpen(view)
 
     if ft == "makefile" or ft == "go" then
         SetOption("tabstospaces", "off")
-    elseif ft == "python" or ft == "python2" or ft == "python3" then
+    elseif ft == "python" or ft == "python2" or ft == "python3" or ft == "yaml" then
         SetOption("tabstospaces", "on")
     end
 end