diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index 514648cfa3494b015fa844ec1020b2f563806369..1e37c9765bef0b59a3bd98d0fc3b096edc8f07a0 100644
--- a/crates/lsp/src/lsp.rs
+++ b/crates/lsp/src/lsp.rs
@@ -335,6 +335,7 @@ impl LanguageServer {
                     did_change_configuration: Some(DynamicRegistrationClientCapabilities {
                         dynamic_registration: Some(true),
                     }),
+                    workspace_folders: Some(true),
                     ..Default::default()
                 }),
                 text_document: Some(TextDocumentClientCapabilities {
diff --git a/crates/zed/src/languages/yaml.rs b/crates/zed/src/languages/yaml.rs
index a34bbeb5964d7267444a861d9020dcab2d8f0ccf..a9a87fd585e77d308c7be7ccb9ccd4ef9af8f16d 100644
--- a/crates/zed/src/languages/yaml.rs
+++ b/crates/zed/src/languages/yaml.rs
@@ -106,6 +106,9 @@ impl LspAdapter for YamlLspAdapter {
         let settings = cx.global::<Settings>();
         Some(
             future::ready(serde_json::json!({
+                "yaml": {
+                    "keyOrdering": false
+                },
                 "[yaml]": {
                     "editor.tabSize": settings.tab_size(Some("YAML"))
                 }