diff --git a/aider/main.py b/aider/main.py
index e6812415c..deec34663 100644
--- a/aider/main.py
+++ b/aider/main.py
@@ -13,6 +13,7 @@ from aider.args import get_parser
 from aider.coders import Coder
 from aider.commands import SwitchModel
 from aider.io import InputOutput
+from prompt_toolkit.shortcuts import EditingMode
 from aider.litellm import litellm  # noqa: F401; properly init litellm on launch
 from aider.repo import GitRepo
 from aider.versioncheck import check_version
@@ -246,6 +247,9 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
     if return_coder and args.yes is None:
         args.yes = True
 
+    editing_mode = EditingMode.VI if args.vim else EditingMode.EMACS
+        args.yes = True
+
     editing_mode = EditingMode.VI if args.vim else EditingMode.EMACS
 
     io = InputOutput(