diff --git a/lua/lazyvim/config/options.lua b/lua/lazyvim/config/options.lua
index 2262dbff..16afa00a 100644
--- a/lua/lazyvim/config/options.lua
+++ b/lua/lazyvim/config/options.lua
@@ -61,6 +61,8 @@ else
 end
 if vim.treesitter.foldtext then
   vim.opt.foldtext = "v:lua.vim.treesitter.foldtext()"
+if vim.fn.has("nvim-0.9.0") == 1 then
+  vim.opt.statuscolumn = [[%!v:lua.require'lazyvim.util.ui'.statuscolumn()]]
 end
 
 -- Fix markdown indentation settings
diff --git a/lua/lazyvim/util/ui.lua b/lua/lazyvim/util/ui.lua
new file mode 100644
index 00000000..549e3201
--- /dev/null
+++ b/lua/lazyvim/util/ui.lua
@@ -0,0 +1,57 @@
+local M = {}
+
+---@alias Sign {name:string, text:string, texthl:string}
+
+---@return Sign[]
+function M.get_signs(win)
+  local buf = vim.api.nvim_win_get_buf(win)
+  ---@diagnostic disable-next-line: no-unknown
+  return vim.tbl_map(function(sign)
+    return vim.fn.sign_getdefined(sign.name)[1]
+  end, vim.fn.sign_getplaced(buf, { group = "*", lnum = vim.v.lnum })[1].signs)
+end
+
+---@param sign? Sign
+---@param len? number
+function M.icon(sign, len)
+  sign = sign or {}
+  len = len or 1
+  local text = vim.fn.strcharpart(sign.text or "", 0, len, false) ---@type string
+  text = text .. string.rep(" ", len - vim.fn.strchars(text))
+  return sign.texthl and ("%#" .. sign.texthl .. "#" .. text .. "%*") or text
+end
+
+function M.statuscolumn()
+  local win = vim.g.statusline_winid
+  if vim.wo[win].signcolumn == "no" then
+    return ""
+  end
+
+  ---@type Sign?,Sign?,Sign?
+  local left, right, fold
+  for _, s in ipairs(M.get_signs(win)) do
+    if s.name:find("GitSign") then
+      right = s
+    elseif not left then
+      left = s
+    end
+  end
+
+  if vim.fn.foldclosed(vim.v.lnum) >= 0 then
+    fold = { text = vim.opt.fillchars:get().foldclose or "", texthl = "Folded" }
+  end
+
+  local nu = ""
+  if vim.wo[win].number and vim.v.virtnum == 0 then
+    nu = vim.wo[win].relativenumber and vim.v.relnum ~= 0 and vim.v.relnum or vim.v.lnum
+  end
+
+  return table.concat({
+    M.icon(left),
+    [[%=]],
+    nu .. " ",
+    M.icon(fold or right, 2),
+  }, "")
+end
+
+return M