diff --git a/src/app/editor/editor.component.html b/src/app/editor/editor.component.html
index 688e3bf..59dcd6f 100644
--- a/src/app/editor/editor.component.html
+++ b/src/app/editor/editor.component.html
@@ -1,4 +1,4 @@
-<mat-tab-group>
+<mat-tab-group [(selectedIndex)]="activeTab">
   <mat-tab *ngFor="let modelComponent of gameModelComponents">
     <ng-template mat-tab-label>
       <mat-icon class="example-tab-icon unsaved" *ngIf="modelComponent.type === ModelComponentType.SCRIPTACCOUNT" [ngClass]="modelComponent.unsaved? 'unsaved':'saved'">inventory_2</mat-icon>
diff --git a/src/app/editor/editor.component.ts b/src/app/editor/editor.component.ts
index c042346..480330d 100644
--- a/src/app/editor/editor.component.ts
+++ b/src/app/editor/editor.component.ts
@@ -15,10 +15,12 @@ import {Transition} from "../game-model/gamesystems/Transition";
 export class EditorComponent {
   gameModelComponents: ModelComponent[] = [];
   @Output("onModelNameUpdate") onModelNameUpdateEmitter = new EventEmitter<boolean>();
+  activeTab: number = this.gameModelComponents.length;
 
   openGameModelComponent(gameModelComponent: ModelComponent) {
     if(!this.gameModelComponents.includes(gameModelComponent)) {
       this.gameModelComponents.push(gameModelComponent);
+      this.activeTab = this.gameModelComponents.length;
     }
   }