diff --git a/aider/main.py b/aider/main.py
index deec34663..af36f8925 100644
--- a/aider/main.py
+++ b/aider/main.py
@@ -14,6 +14,7 @@ from aider.coders import Coder
 from aider.commands import SwitchModel
 from aider.io import InputOutput
 from prompt_toolkit.shortcuts import EditingMode
+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
@@ -247,9 +248,6 @@ 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(