diff --git a/src/app/app.component.html b/src/app/app.component.html
index 0f43965..dee2fce 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -23,7 +23,7 @@
         </mat-menu>
       </div>
       <app-script-account-overview *ngIf="openContent == ModelComponentType.SCRIPTACCOUNT" #scriptAccountOverview [gameModel]="gameModel" (onOpenScriptAccount)="openModelComponent($event)"></app-script-account-overview>
-      <app-gamescript-overview *ngIf="openContent == ModelComponentType.GAMESYTEM" #gamesystemOverview [gameModel]="gameModel"></app-gamescript-overview>
+      <app-gamescript-overview *ngIf="openContent == ModelComponentType.GAMESYTEM" #gamesystemOverview [gameModel]="gameModel" (openGamesystemEditor)="openModelComponent($event)"></app-gamescript-overview>
     </mat-drawer>
 
     <div class="example-sidenav-content">
diff --git a/src/app/side-overviews/gamescript-overview/gamescript-overview.component.ts b/src/app/side-overviews/gamescript-overview/gamescript-overview.component.ts
index c91c383..892bcde 100644
--- a/src/app/side-overviews/gamescript-overview/gamescript-overview.component.ts
+++ b/src/app/side-overviews/gamescript-overview/gamescript-overview.component.ts
@@ -86,5 +86,9 @@ export class GamescriptOverviewComponent implements OnInit {
 
   openGamesystemEditor(node: FlatNode) {
     const gamesystem: Gamesystem<State<any>, Transition<any>>| undefined= this.gameModel!.findGamesystem(node.name);
+    if(gamesystem != undefined) {
+      gamesystem.unsaved = false;
+      this.openGamesystemEmitter.emit(gamesystem);
+    }
   }
 }