diff --git a/docs/changelog.rst b/docs/changelog.rst
index dea23b7bf..a2232df38 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -12,6 +12,8 @@ To update |kitty|, :doc:`follow the instructions <binary>`.
 
 - X11: Fix crash when doing drag and drop from some applications (:iss:`2505`)
 
+- Fix :option:`launch --stdin-add-formatting` not working (:iss:`2512`)
+
 
 0.17.2 [2020-03-29]
 --------------------
diff --git a/kitty/launch.py b/kitty/launch.py
index 41ecddff7..9dcd54cb4 100644
--- a/kitty/launch.py
+++ b/kitty/launch.py
@@ -277,6 +277,9 @@ def launch(boss: Boss, opts: LaunchCLIOptions, args: List[str], target_tab: Opti
         kw['overlay_for'] = active.id
     if opts.stdin_source and opts.stdin_source != 'none':
         q = opts.stdin_source
+        if opts.stdin_add_formatting:
+            if q in ('@screen', '@screen_scrollback', '@alternate', '@alternate_scrollback'):
+                q = '@ansi_' + q[1:]
         if opts.stdin_add_line_wrap_markers:
             q += '_wrap'
         penv, stdin = boss.process_stdin_source(window=active, stdin=q)