diff --git a/.config/nvim/ftplugin/markdown.lua b/.config/nvim/ftplugin/markdown.lua
index 409411b5..58ea4b91 100644
--- a/.config/nvim/ftplugin/markdown.lua
+++ b/.config/nvim/ftplugin/markdown.lua
@@ -1,4 +1,3 @@
 vim.bo.shiftwidth = 2
 vim.bo.tabstop = 2
 vim.bo.textwidth = 100
-vim.wo.colorcolumn = "100"
diff --git a/.config/nvim/ftplugin/typst.lua b/.config/nvim/ftplugin/typst.lua
index 409411b5..58ea4b91 100644
--- a/.config/nvim/ftplugin/typst.lua
+++ b/.config/nvim/ftplugin/typst.lua
@@ -1,4 +1,3 @@
 vim.bo.shiftwidth = 2
 vim.bo.tabstop = 2
 vim.bo.textwidth = 100
-vim.wo.colorcolumn = "100"
diff --git a/.config/nvim/plugin/autocommands.lua b/.config/nvim/plugin/autocommands.lua
index 5e65a9d2..fc114051 100644
--- a/.config/nvim/plugin/autocommands.lua
+++ b/.config/nvim/plugin/autocommands.lua
@@ -23,10 +23,20 @@ vim.api.nvim_create_autocmd("OptionSet", {
     end,
 })
 
+local auto_colorcolumn = vim.api.nvim_create_augroup("auto_colorcolumn", {})
 vim.api.nvim_create_autocmd("OptionSet", {
+    group = auto_colorcolumn,
     pattern = "textwidth",
     callback = function() vim.wo.colorcolumn = tostring(vim.bo.textwidth) end,
 })
+vim.api.nvim_create_autocmd("BufEnter", {
+    group = auto_colorcolumn,
+    callback = function()
+        if vim.bo.textwidth then
+            vim.wo.colorcolumn = tostring(vim.bo.textwidth)
+        end
+    end,
+})
 
 vim.api.nvim_create_autocmd("LspProgress", {
     once = true,