diff --git a/.config/lazygit/config.yml b/.config/lazygit/config.yml
index 537c4fb4..abe5bd0f 100644
--- a/.config/lazygit/config.yml
+++ b/.config/lazygit/config.yml
@@ -48,7 +48,7 @@ git:
   allBranchesLogCmd: "git log --graph --all --color=always --abbrev-commit --date-relative --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'"
   parseEmoji: true
 os:
-  editPreset: "nvim-remote" # see 'Configuring File Editing' section
+  edit: '[ -z "$NVIM" ] && (nvim -- {{filename}}) || (nvim --server "$NVIM" --remote-send "q" && nvim --server "$NVIM" --remote {{filename}})'
 disableStartupPopups: true
 notARepository: "skip" # one of: 'prompt' | 'create' | 'skip' | 'quit'
 keybinding: