diff --git a/docs/shell-integration.rst b/docs/shell-integration.rst
index e10351d57..118459d2f 100644
--- a/docs/shell-integration.rst
+++ b/docs/shell-integration.rst
@@ -274,6 +274,8 @@ Edit files in new kitty windows even over SSH
 
    edit-in-kitty myfile.txt
    edit-in-kitty --type tab --title "Editing My File" myfile.txt
+   # open file.txt at line 75 (works with vim, emacs, nano, micro)
+   edit-in-kitty +75 file.txt
 
 The :command:`edit-in-kitty` command allows you to seamlessly edit files
 in your default :opt:`editor` in new kitty windows. This works even over
diff --git a/kitty/launch.py b/kitty/launch.py
index 71b4a5455..ec2140f62 100644
--- a/kitty/launch.py
+++ b/kitty/launch.py
@@ -498,7 +498,7 @@ def launch(
     return None
 
 
-def parse_opts_for_clone(args: List[str]) -> LaunchCLIOptions:
+def parse_opts_for_clone(args: List[str]) -> Tuple[LaunchCLIOptions, List[str]]:
     unsafe, unsafe_args = parse_launch_args(args)
     default_opts, default_args = parse_launch_args()
     # only copy safe options, those that dont lead to local code exec
@@ -508,7 +508,7 @@ def parse_opts_for_clone(args: List[str]) -> LaunchCLIOptions:
         'logo', 'logo_position', 'logo_alpha', 'color'
     ):
         setattr(default_opts, x, getattr(unsafe, x))
-    return default_opts
+    return default_opts, unsafe_args
 
 
 def parse_bash_env(text: str) -> Dict[str, str]:
@@ -593,7 +593,15 @@ class EditCmd:
                 setattr(self, k, v)
         if self.abort_signaled:
             return
-        self.file_spec = self.args.pop()
+        self.opts, extra_args = parse_opts_for_clone(['--type=overlay'] + self.args)
+        self.file_spec = extra_args.pop()
+        self.line_number = 0
+        import re
+        pat = re.compile(r'\+(-?\d+)')
+        for x in extra_args:
+            m = pat.match(x)
+            if m is not None:
+                self.line_number = int(m.group(1))
         self.file_name = os.path.basename(self.file_spec)
         self.file_localpath = os.path.normpath(os.path.join(self.cwd, self.file_spec))
         self.is_local_file = False
@@ -610,7 +618,6 @@ class EditCmd:
         self.file_obj = open(self.file_localpath, 'rb')
         self.file_data = b''
         self.last_mod_time = self.file_mod_time
-        self.opts = parse_opts_for_clone(['--type=overlay'] + self.args)
         if not self.opts.cwd:
             self.opts.cwd = os.path.dirname(self.file_obj.name)
 
@@ -678,7 +685,7 @@ class CloneCmd:
         self.pid = -1
         self.history = ''
         self.parse_message(msg)
-        self.opts = parse_opts_for_clone(self.args)
+        self.opts = parse_opts_for_clone(self.args)[0]
 
     def parse_message(self, msg: str) -> None:
         simple = 'pid', 'envfmt', 'shell'
@@ -721,7 +728,7 @@ def remote_edit(msg: str, window: Window) -> None:
         if q is not None:
             q.abort_signaled = c.abort_signaled
         return
-    cmdline = get_editor() + [c.file_obj.name]
+    cmdline = get_editor(path_to_edit=c.file_obj.name, line_number=c.line_number)
     w = launch(get_boss(), c.opts, cmdline, active=window)
     if w is not None:
         c.source_window_id = window.id
diff --git a/kitty/utils.py b/kitty/utils.py
index 78a482c85..d82a47ade 100644
--- a/kitty/utils.py
+++ b/kitty/utils.py
@@ -620,7 +620,7 @@ def get_editor_from_env_vars(opts: Optional[Options] = None) -> List[str]:
     return shlex.split(ans)
 
 
-def get_editor(opts: Optional[Options] = None) -> List[str]:
+def get_editor(opts: Optional[Options] = None, path_to_edit: str = '', line_number: int = 0) -> List[str]:
     if opts is None:
         from .fast_data_types import get_options
         try:
@@ -630,9 +630,20 @@ def get_editor(opts: Optional[Options] = None) -> List[str]:
             from .cli import create_default_opts
             opts = create_default_opts()
     if opts.editor == '.':
-        return get_editor_from_env_vars()
-    import shlex
-    return shlex.split(opts.editor)
+        ans = get_editor_from_env_vars()
+    else:
+        import shlex
+        ans = shlex.split(opts.editor)
+    if path_to_edit:
+        if line_number:
+            eq = os.path.basename(ans[-1]).lower()
+            if eq in ('code', 'code.exe'):
+                path_to_edit += f':{line_number}'
+                ans.append('--goto')
+            else:
+                ans.append(f'+{line_number}')
+        ans.append(path_to_edit)
+    return ans
 
 
 def is_path_in_temp_dir(path: str) -> bool: