diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 8c8ef98..cdc62e8 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -146,10 +146,12 @@ export class AppComponent implements OnInit{
     } else {
       parentGamesystemName = this.gamesystemOverview!.selectedGamesystemName;
     }
+
+
     const createdGamesystem = this.gameModel!.createGamesystem("New Gamesystem", parentGamesystemName);
     if(createdGamesystem != undefined) {
       this.gamesystemOverview!.refresh();
-      this.editor?.openGameModelComponent(createdGamesystem!);
+      this.editor?.openGameModelComponent(createdGamesystem);
     }
   }
 
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 38c0c5c..a3341ac 100644
--- a/src/app/side-overviews/gamescript-overview/gamescript-overview.component.ts
+++ b/src/app/side-overviews/gamescript-overview/gamescript-overview.component.ts
@@ -102,6 +102,7 @@ export class GamescriptOverviewComponent implements OnInit {
 
   refresh() {
     this.dataSource.data = this.gameModel!.gamesystems;
+    this.resetSelectedGamesystem()
   }
 
   resetSelectedGamesystem() {