diff --git a/lua/r/quarto.lua b/lua/r/quarto.lua
index d5068352..49083f26 100644
--- a/lua/r/quarto.lua
+++ b/lua/r/quarto.lua
@@ -62,4 +62,41 @@ M.get_code_chunk = function(bufnr, lang, row)
     return r_contents
 end
 
+--- Helper function to get code block info from Rmd or Quarto document
+---@return table|nil
+M.get_ts_chunks = function()
+    local root = require("r.utils").get_root_node()
+
+    if not root then return nil end
+
+    local query = vim.treesitter.query.parse(
+        "markdown",
+        [[
+           (fenced_code_block) @fcb
+        ]]
+    )
+
+    local bufnr = vim.api.nvim_get_current_buf()
+    local chunks = {}
+    for _, node, _ in query:iter_captures(root, 0, bufnr, -1) do
+        local lang = "unknown"
+        for cn in node:iter_children() do
+            if cn:type() == "info_string" then
+                for ic in cn:iter_children() do
+                    if ic:type() == "language" then
+                        lang = vim.treesitter.get_node_text(ic, bufnr)
+                    end
+                end
+            end
+        end
+        local start_row, _, end_row, _ = node:range()
+        table.insert(chunks, {
+            lang = lang,
+            start_row = start_row + 1,
+            end_row = end_row + 1,
+        })
+    end
+    return chunks
+end
+
 return M
diff --git a/lua/r/utils.lua b/lua/r/utils.lua
index 35b03c85..27383b8c 100644
--- a/lua/r/utils.lua
+++ b/lua/r/utils.lua
@@ -79,26 +79,23 @@ function M.get_lang()
     if vim.bo.filetype == "" then return "none" end
     -- Treesitter for rnoweb always return "latex" or "rnoweb"
     if vim.bo.filetype == "rnoweb" then return get_rnw_lang() end
-    -- No treesitter parser for rhelp
+    -- There is no treesitter parser for rhelp
     if vim.bo.filetype == "rhelp" then return get_rhelp_lang() end
 
-    local p
-    if vim.bo.filetype == "rmd" or vim.bo.filetype == "quarto" then
-        local cline = vim.api.nvim_get_current_line()
-        if cline:find("^```.*child *= *") then
-            return "chunk_child"
-        elseif cline:find("^```%{") then
+    local chunks = require("r.quarto").get_ts_chunks()
+    if not chunks then return "nil" end
+
+    local lnum = vim.api.nvim_win_get_cursor(0)[1]
+    for _, v in pairs(chunks) do
+        if lnum == v.start_row then
+            local cline = vim.api.nvim_get_current_line()
+            if cline:find("^```.*child *= *") then return "chunk_child" end
             return "chunk_header"
-        elseif cline:find("^```$") then
-            return "chunk_end"
         end
-        p = vim.treesitter.get_parser(vim.api.nvim_get_current_buf(), "markdown")
-    else
-        p = vim.treesitter.get_parser()
+        if lnum == v.end_row then return "chunk_end" end
+        if v.start_row < lnum and v.end_row > lnum then return v.lang end
     end
-    local c = vim.api.nvim_win_get_cursor(0)
-    local lang = p:language_for_range({ c[1] - 1, c[2], c[1] - 1, c[2] }):lang()
-    return lang
+    return "container"
 end
 
 --- Request the windows manager to focus a window.