diff --git a/lua/opencode/ui/input_window.lua b/lua/opencode/ui/input_window.lua
index 50442daa..b3aeefb6 100644
--- a/lua/opencode/ui/input_window.lua
+++ b/lua/opencode/ui/input_window.lua
@@ -257,6 +257,7 @@ function M.setup(windows)
   window_options.set_buffer_option('filetype', 'opencode', windows.input_buf)
   window_options.set_window_option('winhighlight', config.ui.window_highlight, windows.input_win)
   window_options.set_window_option('statuscolumn', '', windows.input_win)
+  window_options.set_window_option('colorcolumn', '', windows.input_win)
 
   -- Apply user-configurable window options
   local win_opts = config.ui.input.win_options or {}
diff --git a/lua/opencode/ui/output_window.lua b/lua/opencode/ui/output_window.lua
index ce160616..b1439625 100644
--- a/lua/opencode/ui/output_window.lua
+++ b/lua/opencode/ui/output_window.lua
@@ -193,6 +193,7 @@ function M.setup(windows)
   window_options.set_window_option('signcolumn', 'yes', windows.output_win, { save_original = true })
   window_options.set_window_option('list', false, windows.output_win, { save_original = true })
   window_options.set_window_option('statuscolumn', '', windows.output_win, { save_original = true })
+  window_options.set_window_option('colorcolumn', '', windows.output_win, { save_original = true })
 
   M.update_dimensions(windows)
   M.reset_scroll_tracking(windows.output_win)