diff --git a/kitty/session.py b/kitty/session.py
index 3b5daf17c..545834ee1 100644
--- a/kitty/session.py
+++ b/kitty/session.py
@@ -110,10 +110,9 @@ def create_session(opts, args=None, special_window=None, cwd_from=None):
     if special_window is None:
         cmd = args.args if args and args.args else [shell_path]
         from kitty.tabs import SpecialWindow
+        k = {'cwd_from': cwd_from}
         if getattr(args, 'title', None):
-            ans.add_special_window(SpecialWindow(cmd, override_title=args.title, cwd_from=cwd_from))
-        else:
-            ans.add_special_window(SpecialWindow(cmd, cwd_from=cwd_from))
-    else:
-        ans.add_special_window(special_window)
+            k['override_title'] = args.title
+        special_window = SpecialWindow(cmd, **k)
+    ans.add_special_window(special_window)
     return ans