diff --git a/lua/my_autocommands.lua b/lua/my_autocommands.lua
index f058acb..9f048e4 100644
--- a/lua/my_autocommands.lua
+++ b/lua/my_autocommands.lua
@@ -46,7 +46,8 @@ api.nvim_create_autocmd({ 'BufRead', 'BufNewFile' }, {
 })
 
 -- Read and write shada file
-api.nvim_create_autocmd({ 'FocusGained', 'FocusLost' }, { command = [[rshada | wshada]] })
+api.nvim_create_autocmd({ 'FocusLost' }, { command = [[wshada]] })
+api.nvim_create_autocmd({ 'FocusGained' }, { command = [[rshada]] })
 
 -- go to last loc when opening a buffer
 api.nvim_create_autocmd(
diff --git a/lua/my_keymappings.lua b/lua/my_keymappings.lua
index 7554670..32e5a08 100644
--- a/lua/my_keymappings.lua
+++ b/lua/my_keymappings.lua
@@ -21,7 +21,7 @@ vim.keymap.set('n', '<A-Down>', ':wincmd j<CR>', { noremap = true, silent = true
 vim.keymap.set('n', '<A-Left>', ':wincmd h<CR>', { noremap = true, silent = true })
 vim.keymap.set('n', '<A-Right>', ':wincmd l<CR>', { noremap = true, silent = true })
 
-vim.keymap.set('n', '<C-S>', ':wa<CR>')
+vim.keymap.set('n', '<C-S>', ':wa | wshada<CR>')
 
 -- Linewrap and jumping
 vim.keymap.set('n', 'k', 'gk')