diff --git a/nvim/init.vim b/nvim/init.vim
index 41bf126..9415d4a 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -106,7 +106,8 @@ set modeline
 let mapleader = "\<Space>" " Make space the leader key
 nnoremap <Leader>w :w<CR>| " Write file
 nnoremap <Leader>q :q<CR>| " Close file
-nnoremap <Leader>s :w !sudo tee %<CR>L<CR>
+nnoremap <Leader>s :w !sudo -A tee %<CR>L<CR>
+cmap w!! w !sudo -A tee > /dev/null %
 
 nmap <Leader><Leader> V| " Change to visual line mode
 map q: :q| " No command history
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 89d6495..39b035f 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -50,6 +50,9 @@ if `which go &>/dev/null`; then
     export GOPATH=$(go env GOPATH)
 fi
 
+# Sudo workaround for neovim
+export SUDO_ASKPASS=$(command -v ssh-askpass)
+
 # Powerlevel 10k
 # Remove padding on right side
 ZLE_RPROMPT_INDENT=0