diff --git a/lua/opencode/ui/history_picker.lua b/lua/opencode/ui/history_picker.lua
index aa3c2c15..9c6f941c 100644
--- a/lua/opencode/ui/history_picker.lua
+++ b/lua/opencode/ui/history_picker.lua
@@ -94,6 +94,7 @@ function M.pick(callback)
         local windows = state.windows
         if not input_window.mounted(windows) then
           require('opencode.core').open({ focus_input = true })
+          windows = state.windows
         end
         ---@cast windows { input_win: integer, input_buf: integer }