diff --git a/doc/gp.nvim.txt b/doc/gp.nvim.txt
index e0cb070e..5d0acfca 100644
--- a/doc/gp.nvim.txt
+++ b/doc/gp.nvim.txt
@@ -1,4 +1,4 @@
-*gp.nvim.txt*           For NVIM v0.8.0          Last change: 2023 December 20
+*gp.nvim.txt*           For NVIM v0.8.0          Last change: 2023 December 27
 
 ==============================================================================
 Table of Contents                                  *gp.nvim-table-of-contents*
diff --git a/lua/gp/init.lua b/lua/gp/init.lua
index 6ade2985..8f2f5b40 100644
--- a/lua/gp/init.lua
+++ b/lua/gp/init.lua
@@ -1762,7 +1762,19 @@ M.cmd.ChatPaste = function(params)
 	local target = M.resolve_buf_target(params)
 
 	last = vim.fn.resolve(last)
-	local buf = M.open_buf(last, target, M._toggle_kind.chat, true)
+	local buf = M._H.get_buffer(last)
+	local win_found = false
+	if buf then
+		for _, w in ipairs(vim.api.nvim_list_wins()) do
+			if vim.api.nvim_win_get_buf(w) == buf then
+				vim.api.nvim_set_current_win(w)
+				vim.api.nvim_set_current_buf(buf)
+				win_found = true
+				break
+			end
+		end
+	end
+	buf = win_found and buf or M.open_buf(last, target, M._toggle_kind.chat, true)
 
 	M.append_selection(params, cbuf, buf)
 	M._H.feedkeys("G", "x")