diff --git a/modules/plugins/treesitter/config.nix b/modules/plugins/treesitter/config.nix
index 899e7c190..a0f025034 100644
--- a/modules/plugins/treesitter/config.nix
+++ b/modules/plugins/treesitter/config.nix
@@ -54,10 +54,7 @@ in {
             callback = function()
               vim.wo[0][0].foldmethod = "expr"
               vim.wo[0][0].foldexpr = "v:lua.vim.treesitter.foldexpr()"
-              -- This is optional, but is set rather as a sane default.
-              -- If unset, opened files will be folded by automatically as
-              -- the files are opened
-              vim.o.foldenable = false
+              vim.o.foldenable = ${if cfg.foldEnable then "true" else "false"}
             end,
           })
         ''}
diff --git a/modules/plugins/treesitter/treesitter.nix b/modules/plugins/treesitter/treesitter.nix
index c2039a9fa..7376dc88f 100644
--- a/modules/plugins/treesitter/treesitter.nix
+++ b/modules/plugins/treesitter/treesitter.nix
@@ -10,6 +10,7 @@ in {
     enable = mkEnableOption "treesitter, also enabled automatically through language options";
 
     fold = mkEnableOption "fold with treesitter";
+    foldEnable = mkEnableOption "folds when treesitter folding is configured";
     autotagHtml = mkEnableOption "autoclose and rename html tag";
 
     grammars = mkOption {