diff --git a/docs/changelog.rst b/docs/changelog.rst
index 8b9611344..9f1ebd34e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -25,6 +25,9 @@ To update |kitty|, :doc:`follow the instructions <binary>`.
 - Fix regression causing incorrect rendering of separators in tab bar when
   defining a tab bar background color (:pull:`2480`)
 
+- Fix a regression in 0.17 that broke the kitty @ launch remote command and
+  also broke the --tab-title option when creating a new tab. (:iss:`2488`)
+
 
 0.17.1 [2020-03-24]
 --------------------
diff --git a/kitty/launch.py b/kitty/launch.py
index 54e0bcfe6..f44bbb68f 100644
--- a/kitty/launch.py
+++ b/kitty/launch.py
@@ -176,7 +176,7 @@ def tab_for_window(boss: Boss, opts: LaunchCLIOptions, target_tab: Optional[Tab]
         tm = boss.active_tab_manager
         if tm:
             tab: Optional[Tab] = tm.new_tab(empty_tab=True, location=opts.location)
-            if opts.tab_title and tab:
+            if opts.tab_title and tab is not None:
                 tab.set_title(opts.tab_title)
         else:
             tab = None
diff --git a/kitty/rc/launch.py b/kitty/rc/launch.py
index e108457c3..eb290c8bb 100644
--- a/kitty/rc/launch.py
+++ b/kitty/rc/launch.py
@@ -5,6 +5,7 @@
 
 from typing import TYPE_CHECKING, Optional
 
+from kitty.cli_stub import LaunchCLIOptions
 from kitty.launch import (
     launch as do_launch, options_spec as launch_options_spec,
     parse_launch_args
@@ -16,7 +17,7 @@ from .base import (
 )
 
 if TYPE_CHECKING:
-    from kitty.cli_stub import LaunchRCOptions as CLIOptions, LaunchCLIOptions
+    from kitty.cli_stub import LaunchRCOptions as CLIOptions
 
 
 class Launch(RemoteCommand):