diff --git a/terminatorlib/optionparse.py b/terminatorlib/optionparse.py
index f22e4207..38e76764 100755
--- a/terminatorlib/optionparse.py
+++ b/terminatorlib/optionparse.py
@@ -134,7 +134,8 @@ icon for the window (by file or name)'))
 
     if options.working_directory:
         if os.path.exists(os.path.expanduser(options.working_directory)):
-            os.chdir(os.path.expanduser(options.working_directory))
+            options.working_directory = os.path.expanduser(options.working_directory)
+            os.chdir(options.working_directory)
         else:
             err('OptionParse::parse_options: %s does not exist' %
                     options.working_directory)