diff --git a/runtime/pack/dist/opt/nvim.undotree/lua/undotree.lua b/runtime/pack/dist/opt/nvim.undotree/lua/undotree.lua
index d0707112fb..2a21f68d91 100644
--- a/runtime/pack/dist/opt/nvim.undotree/lua/undotree.lua
+++ b/runtime/pack/dist/opt/nvim.undotree/lua/undotree.lua
@@ -236,7 +236,10 @@ local function buf_apply_graph_lines(tree, graph_lines, buf, meta, find_seq)
         local end_ = vim.api.nvim_buf_line_count(buf) - 1
         local start = end_ - #line_buffer + 3
         vim.api.nvim_buf_call(buf, function()
-          vim.cmd.fold { range = { start, end_ } }
+          local w = vim.b[buf].nvim_is_undotree
+          if vim.api.nvim_win_is_valid(w) and vim.wo[w].foldmethod == 'manual' then
+            vim.cmd.fold { range = { start, end_ } }
+          end
         end)
       end