diff --git a/lua/kitty-scrollback/footer_win.lua b/lua/kitty-scrollback/footer_win.lua
index 90927f8..817bbf2 100644
--- a/lua/kitty-scrollback/footer_win.lua
+++ b/lua/kitty-scrollback/footer_win.lua
@@ -64,9 +64,8 @@ M.open_footer_window = function(winopts, refresh_only)
     -- if buffer already exists, assume window is already created and just read
     p.footer_bufid = vim.api.nvim_create_buf(false, true)
     vim.api.nvim_buf_set_name(p.footer_bufid, vim.fn.tempname() .. '.ksb_footerbuf')
-    vim.api.nvim_set_option_value('filetype', 'help', {
-      buf = p.footer_bufid,
-    })
+    vim.api.nvim_set_option_value('filetype', 'help', { buf = p.footer_bufid })
+    vim.api.nvim_set_option_value('swapfile', false, { buf = p.paste_bufid })
 
     p.footer_winid = vim.api.nvim_open_win(p.footer_bufid, false, M.footer_winopts(winopts))
 
diff --git a/lua/kitty-scrollback/launch.lua b/lua/kitty-scrollback/launch.lua
index 8c6d30c..2312db5 100644
--- a/lua/kitty-scrollback/launch.lua
+++ b/lua/kitty-scrollback/launch.lua
@@ -382,6 +382,7 @@ M.launch = function()
       p.bufid = vim.api.nvim_create_buf(true, true)
       vim.api.nvim_set_current_buf(p.bufid)
     end
+    vim.api.nvim_set_option_value('swapfile', false, { buf = p.bufid })
     p.winid = vim.api.nvim_get_current_win()
 
     ksb_autocmds.load_autocmds()
diff --git a/lua/kitty-scrollback/windows.lua b/lua/kitty-scrollback/windows.lua
index 0aee2dc..046bcb7 100644
--- a/lua/kitty-scrollback/windows.lua
+++ b/lua/kitty-scrollback/windows.lua
@@ -102,9 +102,8 @@ M.open_paste_window = function(start_insert)
     p.paste_bufid = vim.api.nvim_create_buf(false, false)
     vim.api.nvim_buf_set_name(p.paste_bufid, vim.fn.tempname() .. '.ksb_pastebuf')
     local ft = opts.paste_window.filetype or vim.fn.fnamemodify(vim.o.shell, ':t:r')
-    vim.api.nvim_set_option_value('filetype', ft, {
-      buf = p.paste_bufid,
-    })
+    vim.api.nvim_set_option_value('filetype', ft, { buf = p.paste_bufid })
+    vim.api.nvim_set_option_value('swapfile', false, { buf = p.paste_bufid })
     ksb_keymaps.set_buffer_local_keymaps(p.paste_bufid)
   end
   if not p.paste_winid or vim.fn.win_id2win(p.paste_winid) == 0 then
@@ -164,7 +163,7 @@ M.show_status_window = function()
         border = 'none',
       }
     end
-
+    vim.api.nvim_set_option_value('swapfile', false, { buf = popup_bufid })
     local popup_winid = vim.api.nvim_open_win(
       popup_bufid,
       false,