diff --git a/src/app/editor/editor.component.ts b/src/app/editor/editor.component.ts
index 480330d..77a8433 100644
--- a/src/app/editor/editor.component.ts
+++ b/src/app/editor/editor.component.ts
@@ -21,6 +21,8 @@ export class EditorComponent {
     if(!this.gameModelComponents.includes(gameModelComponent)) {
       this.gameModelComponents.push(gameModelComponent);
       this.activeTab = this.gameModelComponents.length;
+    } else {
+      this.activeTab = this.gameModelComponents.findIndex(component => component.componentName === gameModelComponent.componentName);
     }
   }