diff --git a/src/modules/opmode_start.json b/src/modules/opmode_start.json
index 66e40497..09c56427 100644
--- a/src/modules/opmode_start.json
+++ b/src/modules/opmode_start.json
@@ -11,7 +11,7 @@
                 "fields": {
                     "NAME": "",
                     "GROUP": "",
-                    "TYPE": "Auto",
+                    "TYPE": "Teleop",
                     "ENABLED": true 
                 }
             },
diff --git a/src/storage/client_side_storage.ts b/src/storage/client_side_storage.ts
index ec18a595..ba1acd49 100644
--- a/src/storage/client_side_storage.ts
+++ b/src/storage/client_side_storage.ts
@@ -240,9 +240,12 @@ class ClientSideStorage implements commonStorage.Storage {
     });
   }
 
-  async createProject(projectName: string, robotContent: string): Promise<void> {
+  async createProject(projectName: string, robotContent: string, opmodeContent : string): Promise<void> {
     const modulePath = commonStorage.makeRobotPath(projectName);
-    return this._saveModule(commonStorage.MODULE_TYPE_ROBOT, modulePath, robotContent);
+    const opmodePath = commonStorage.makeModulePath(projectName, 'Teleop');
+    
+    await this._saveModule(commonStorage.MODULE_TYPE_ROBOT, modulePath, robotContent);
+    await this._saveModule(commonStorage.MODULE_TYPE_OPMODE, opmodePath, opmodeContent);
   }
 
   async createModule(moduleType: string, modulePath: string, moduleContent: string): Promise<void> {
diff --git a/src/storage/common_storage.ts b/src/storage/common_storage.ts
index 10cf8d74..28d728d0 100644
--- a/src/storage/common_storage.ts
+++ b/src/storage/common_storage.ts
@@ -106,7 +106,7 @@ export interface Storage {
   fetchEntry(entryKey: string, defaultValue: string): Promise<string>;
   listProjects(): Promise<Project[]>;
   fetchModuleContent(modulePath: string): Promise<string>;
-  createProject(projectName: string, robotContent: string): Promise<void>;
+  createProject(projectName: string, robotContent: string, opmodeContent: string): Promise<void>;
   createModule(moduleType: string, modulePath: string, moduleContent: string): Promise<void>;
   saveModule(modulePath: string, moduleContent: string): Promise<void>;
   renameProject(oldProjectName: string, newProjectName: string): Promise<void>;
@@ -129,7 +129,8 @@ export async function createProject(
   storage: Storage, proposedUserVisibleName: string): Promise<void> {
   const newProjectName = pascalCaseToSnakeCase(proposedUserVisibleName);
   const robotContent = newRobotContent(newProjectName);
-  await storage.createProject(newProjectName, robotContent);
+  const opmodeContent = newOpModeContent(newProjectName, 'Teleop');
+  await storage.createProject(newProjectName, robotContent, opmodeContent);
 }
 
 /**