diff --git a/src/main.cc b/src/main.cc
index 83d9519b..7242ff96 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -720,7 +720,11 @@ int main(int argc, char* argv[])
                     return -1;
                 }
             }
-            return run_client(*server_session, init_command);
+            String new_files;
+            for (auto name : parser)
+                new_files += format("edit '{}';", escape(real_path(name), "'", '\\'));
+
+            return run_client(*server_session, new_files + init_command);
         }
         else
         {