diff --git a/src/app/model-templates/model-templates.component.html b/src/app/model-templates/model-templates.component.html
index 200b1ba..89fb48b 100644
--- a/src/app/model-templates/model-templates.component.html
+++ b/src/app/model-templates/model-templates.component.html
@@ -1,6 +1,8 @@
 <h2>Models</h2>
 
-<rb-icon-button icon="add" mode="primary" (click)="newModel = !newModel" class="space-below">New model</rb-icon-button>
+<rb-icon-button icon="add" mode="primary" (click)="newModel = !newModel; oldModelGroup = ''" class="space-below">
+  New model
+</rb-icon-button>
 
 <form *ngIf="newModel" #modelForm="ngForm">
   <rb-form-input name="group" label="group" appValidate="string" required [(ngModel)]="modelGroup" #groupInput="ngModel"
diff --git a/src/app/model-templates/model-templates.component.ts b/src/app/model-templates/model-templates.component.ts
index c2a151c..0dfd042 100644
--- a/src/app/model-templates/model-templates.component.ts
+++ b/src/app/model-templates/model-templates.component.ts
@@ -38,7 +38,9 @@ export class ModelTemplatesComponent implements OnInit {
   }
 
   saveModel() {
-    if (this.modelGroup !== this.oldModelGroup) {  // group was changed, delete model in old group
+    console.log(this.modelGroup);
+    console.log(this.oldModelGroup);
+    if (this.oldModelGroup !== '' && this.modelGroup !== this.oldModelGroup) {  // group was changed, delete model in old group
       this.deleteModel(this.oldModelGroup, this.oldModelName);
     }
     this.api.post('/model/' + this.modelGroup, this.model, () => {