diff --git a/lua/options.lua b/lua/options.lua
index 4e469d4..11affb7 100644
--- a/lua/options.lua
+++ b/lua/options.lua
@@ -9,12 +9,13 @@ vim.api.nvim_exec2('language en_US', {})
 -- Shell options
 -- Sets the shell to use for system() and ! commands in windows
 if vim.fn.has 'win32' then
-  vim.opt.shell = 'powershell.exe'
-  vim.opt.shellcmdflag = '-NonInteractive -NoLogo -NoProfile -ExecutionPolicy RemoteSigned -Command '
+  vim.opt.shell = 'pwsh'
+  vim.opt.shellcmdflag =
+    '-NoLogo -NoProfile -ExecutionPolicy RemoteSigned -Command [Console]::InputEncoding=[Console]::OutputEncoding=[System.Text.Encoding]::UTF8;'
+  vim.opt.shellredir = '2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode'
+  vim.opt.shellpipe = '2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode'
   vim.opt.shellxquote = ''
   vim.opt.shellquote = ''
-  vim.opt.shellredir = '2>&1 | Out-File -Encoding UTF8 %s'
-  vim.opt.shellpipe = '2>&1 | Out-File -Encoding UTF8 %s'
 end
 
 -- Format settings